From a08aca5301af8704ebcc56f2c43823545c9bb62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 26 Nov 2023 15:40:18 -0300 Subject: [PATCH] update: 23.11 --- flake.lock | 54 ++++++++++++++++++++-------------------- flake.nix | 4 +-- overlays/default.nix | 7 +----- system/configuration.nix | 5 ++-- system/nix.nix | 3 --- user/pass.nix | 8 +++++- 6 files changed, 39 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 90cab88..3211dbf 100644 --- a/flake.lock +++ b/flake.lock @@ -477,16 +477,16 @@ ] }, "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -502,11 +502,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1699642155, - "narHash": "sha256-qbtMRA6jAFtGGthiCaFZHaqs51pcW6285H3q9bj4QVg=", + "lastModified": 1701012264, + "narHash": "sha256-abwW2vWcacIDWPf6EnYF5q7wk+S/FaRtcvqo7M3mRL4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "92cb44ddb2b464d1ef770ba1f4c79eafecae065b", + "rev": "68e57b7ee36f015d99988f38cb3a8b83c23ae7c3", "type": "github" }, "original": { @@ -602,11 +602,11 @@ ] }, "locked": { - "lastModified": 1699156599, - "narHash": "sha256-Qk9ZE/pG9lNIGUVNArJxL0Hc0Soa92eQPPIhcDwWinU=", + "lastModified": 1700968077, + "narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5388a4002179d6778d212dc2fdcc7ac3fdbd5b65", + "rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07", "type": "github" }, "original": { @@ -672,11 +672,11 @@ }, "nixpkgs-fixed-steam": { "locked": { - "lastModified": 1699723843, - "narHash": "sha256-rxuuyrmBPx3YUOIlhj165tvtyGEOwglUb5oJymGf7QQ=", + "lastModified": 1701016343, + "narHash": "sha256-UhFqv2bl/ZB4RwGxq1Qp6+91uZDwTEA80rxALTiJ3fg=", "owner": "lelgenio", "repo": "nixpkgs", - "rev": "9ae8bd5d3ac0db26113207e45bb59c2cdede3e79", + "rev": "ac4d51306af54a088e29e2e5efcfac5dfe87d95c", "type": "github" }, "original": { @@ -704,26 +704,26 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699291058, - "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", + "lastModified": 1700787330, + "narHash": "sha256-4VIBCyfqnEsdVP/SgKZ3rudwzxGdEqpKfgoWETs/I6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", + "rev": "7f7851dfc570812c305d89438681b715a4f7beba", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "type": "indirect" } }, "nur": { "locked": { - "lastModified": 1699645538, - "narHash": "sha256-CKzsVfYM/9ccp0VDgzB91c33Ts8KSub7q5FWLNJouXk=", + "lastModified": 1701011084, + "narHash": "sha256-5rlj2JSW1Am8pDk/9veNUfZdSInOefsWxfl/p5SiS3s=", "owner": "nix-community", "repo": "NUR", - "rev": "9ffcf2dd6ac13cd0469a0ac2664296f45d879ffb", + "rev": "1f1a69f3dbc9b711f3490156dd686c822fc4b0ae", "type": "github" }, "original": { @@ -1080,18 +1080,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1697909146, - "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=", + "lastModified": 1700734054, + "narHash": "sha256-SBu1y01WjCSrcCKvgfCDDckrZjU/OmCJT8Xc+hPow7E=", "owner": "wlroots", "repo": "wlroots", - "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", + "rev": "2eb225236eb72f27beec921e9f37ddf58e874fba", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", + "rev": "2eb225236eb72f27beec921e9f37ddf58e874fba", "type": "gitlab" } }, @@ -1111,11 +1111,11 @@ ] }, "locked": { - "lastModified": 1697981233, - "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", + "lastModified": 1700508250, + "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", + "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cecca31..37021e8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.05"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + nixpkgs.url = "nixpkgs/nixos-23.11"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/NUR"; diff --git a/overlays/default.nix b/overlays/default.nix index 50c205d..95aa72c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -27,9 +27,6 @@ orchis_theme_compact = (final.orchis-theme.override { border-radius = 0; tweaks = [ "compact" "solid" ]; - }).overrideAttrs (old: { - patches = (old.patches or [ ]) ++ - [ ../patches/orchis-fix-warnings.patch ]; }); nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; }); }); @@ -43,9 +40,7 @@ webcord = (prev.webcord.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ]; - })).override { - electron_24 = final.electron_25; - }; + })); }); patches = (final: prev: { diff --git a/system/configuration.nix b/system/configuration.nix index c924718..fcf56e9 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -83,7 +83,6 @@ services.blueman.enable = true; hardware.bluetooth = { enable = true; - package = pkgs.bluezFull; settings = { General = { DiscoverableTimeout = 0; @@ -127,8 +126,8 @@ gnome3.adwaita-icon-theme # default gnome cursors ]; - fonts.enableDefaultFonts = true; - fonts.fonts = with pkgs; [ + fonts.enableDefaultPackages = true; + fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk noto-fonts-emoji diff --git a/system/nix.nix b/system/nix.nix index 1bb4cb1..87e4324 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -1,7 +1,4 @@ { config, pkgs, inputs, ... }: { - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - nix.registry.nixpkgs.flake = inputs.nixpkgs; nix = { nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; diff --git a/user/pass.nix b/user/pass.nix index 437ad1a..c7bddcf 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -8,7 +8,13 @@ }; services = { pass-secret-service.enable = true; - password-store-sync.enable = true; + git-sync = { + enable = true; + repositories.password-store = { + uri = "git@git.disroot.org:lelgenio/password-store"; + path = toString config.programs.password-store.settings.PASSWORD_STORE_DIR; + }; + }; }; home.packages = with pkgs; [ wpass _gpg-unlock ]; };