From 3ac4eb5503b24b159cabdc0dddf14d89b1e292d8 Mon Sep 17 00:00:00 2001 From: DarkGuibrine Date: Tue, 7 Apr 2026 13:28:26 -0300 Subject: [PATCH] . --- nixos/conf/GM/DE/impde.nix | 4 +- nixos/conf/GM/DE/kde.nix | 5 +- nixos/conf/GM/Pkgs/cloudflared.nix | 17 -- nixos/conf/GM/Pkgs/imp_pkgs.nix | 1 - nixos/conf/HM/pkgs/pkgs.nix | 2 +- nixos/configuration.nix | 4 +- nixos/flake.lock | 448 +++-------------------------- nixos/flake.nix | 45 ++- nixos/hardware-configuration.nix | 6 +- nixos/home.nix | 58 ++-- 10 files changed, 99 insertions(+), 491 deletions(-) delete mode 100644 nixos/conf/GM/Pkgs/cloudflared.nix diff --git a/nixos/conf/GM/DE/impde.nix b/nixos/conf/GM/DE/impde.nix index 73c21bd..5b03860 100644 --- a/nixos/conf/GM/DE/impde.nix +++ b/nixos/conf/GM/DE/impde.nix @@ -3,8 +3,8 @@ imports = [ #./cosmic.nix #./gnome.nix - #./kde.nix - ./niri/niri.nix + ./kde.nix + #./niri/niri.nix ]; diff --git a/nixos/conf/GM/DE/kde.nix b/nixos/conf/GM/DE/kde.nix index 4caf7c2..5412183 100644 --- a/nixos/conf/GM/DE/kde.nix +++ b/nixos/conf/GM/DE/kde.nix @@ -1,6 +1,6 @@ { config, lib, inputs, pkgs, ... }: { - ## Ativar ambiente gráfico KDE Plasma 6 e gerenciador de login SDDM + ## Ativar ambiente gráfico KDE Plasma 6 e gerenciador de login services = { desktopManager.plasma6.enable = true; }; @@ -18,11 +18,12 @@ kdePackages.sddm-kcm kdePackages.wallpaper-engine-plugin kdePackages.krdp + kdePackages.accounts-qt ]; environment.plasma6.excludePackages = with pkgs.kdePackages; [ plasma-browser-integration - konsole + # konsole elisa ]; diff --git a/nixos/conf/GM/Pkgs/cloudflared.nix b/nixos/conf/GM/Pkgs/cloudflared.nix deleted file mode 100644 index 660f741..0000000 --- a/nixos/conf/GM/Pkgs/cloudflared.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, inputs, pkgs, ... }: { - - services.cloudflared = { - enable = true; - tunnels = { - "d5615be7-62ce-414c-a2b3-67dcbbbd4ac4" = { - credentialsFile = "/etc/cloudflared/d5615be7-62ce-414c-a2b3-67dcbbbd4ac4.json"; - default = "http_status:404"; - ingress = { - "pass.darkgui.com.br" = "http://localhost:8080"; - }; - }; - }; - }; - -} - diff --git a/nixos/conf/GM/Pkgs/imp_pkgs.nix b/nixos/conf/GM/Pkgs/imp_pkgs.nix index cc36dfc..18ead76 100644 --- a/nixos/conf/GM/Pkgs/imp_pkgs.nix +++ b/nixos/conf/GM/Pkgs/imp_pkgs.nix @@ -3,6 +3,5 @@ imports = [ ./pkgsconfig.nix ./pkgs.nix - ./cloudflared.nix ]; } diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index 362c0f8..70ad807 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -45,7 +45,7 @@ tree python314 unrar - #droidcam + droidcam motrix mission-center nodejs diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 965af3a..d86a9af 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,9 +8,9 @@ ## Configuração do bootloader boot = { - kernelPackages = pkgs.linuxPackages_latest; + #kernelPackages = pkgs.linuxPackages_latest; #kernelPackages = pkgs.linuxPackages_cachyos; - #kernelPackages = inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; + kernelPackages = inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; diff --git a/nixos/flake.lock b/nixos/flake.lock index 9c98701..5240e7f 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -23,11 +23,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1774853038, - "narHash": "sha256-zMoAFZOALxk3/GhWYOPYRDOPi4WS/dC/2kAG3aoD/u4=", + "lastModified": 1775145950, + "narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "a82bb448f8aac6bb29dd417bffe062259bbf8f88", + "rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1774500343, - "narHash": "sha256-8sCdFTHJF0ZES8/Qa6DVbMAzZ1PLGYcZcQJBokoa7Bg=", + "lastModified": 1775157685, + "narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "948e9c61779b0fafdf0c3b1ee6281502ff178fcc", + "rev": "c1ba300617a12d257b5721572b9bbe28efae182f", "type": "github" }, "original": { @@ -52,45 +52,6 @@ "type": "github" } }, - "dms": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1775049541, - "narHash": "sha256-Wn99/ReFtqiq3kdKKKxYNgxW5BmYWTYDnjf3LRTP5Hk=", - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "rev": "66ce79b9bfc2293531394ebbc6c9f1aabfde9732", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "type": "github" - } - }, - "dms-plugin-registry": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1774979048, - "narHash": "sha256-6zGdHV0Yot5KA4Ag9HkRATOu6Q9N8T339L2JWVutlNY=", - "owner": "AvengeMedia", - "repo": "dms-plugin-registry", - "rev": "367b4b2bf7deac91fe2674d7836edf4bf496d468", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "dms-plugin-registry", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -128,32 +89,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -164,7 +104,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -187,11 +127,11 @@ ] }, "locked": { - "lastModified": 1775047159, - "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", + "lastModified": 1775360939, + "narHash": "sha256-XUBlSgUFdvTh6+K5LcI5mJu5F5L8scmJDMRiZM484TM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", + "rev": "2097a5c82bdc099c6135eae4b111b78124604554", "type": "github" }, "original": { @@ -221,76 +161,20 @@ "type": "github" } }, - "niri": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1775042939, - "narHash": "sha256-qcCBdnnKj8g/TiYmfDl3LmTdLYVPxr08yht9JaTXW00=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "0e4df2c05361ed0f5e8738335369b304a0962b02", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1774616418, - "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-cachyos-kernel": { "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1774982062, - "narHash": "sha256-4EDoYaSztFSMD2K6rdPe/i4V3pl9jiz+ul+hwAZ7P1Q=", + "lastModified": 1775412159, + "narHash": "sha256-217zU2fKzIgcn9qht9MvvHDOgywnAZ0vFsYFg+c80oE=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "95a79dcd59c482dd3215ca5a32f1cbdf40e9f77f", + "rev": "98d1a70e3c0c14d23bc6ef395110664e1221daf4", "type": "github" }, "original": { @@ -317,11 +201,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -332,11 +216,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1775057958, - "narHash": "sha256-Bh1b6kKriMLHBU8ojlYnrMmKuQB1Cvu1QaYU9pNVpk8=", + "lastModified": 1775423271, + "narHash": "sha256-9NcwIfuqcI3DyIfKe18ZNPx/PoPI372IRH0rpAIVBT8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "65d62bf419c94d34a14e40d40bbafbd5ed7f7b01", + "rev": "7fc6bbc546b1276d04884047bd6bfecd9d73a823", "type": "github" }, "original": { @@ -346,22 +230,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1775002709, "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", @@ -395,43 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775371993, + "narHash": "sha256-shlcgEOzW6rl7zmZeYBMP9EpF3O/cTL7/HpWlyqearw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1774935083, - "narHash": "sha256-Mh6bLcYAcENBAZk3RoMPMFCGGMZmfaGMERE4siZOgP4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f4fd5e1abf9bac8c1d22750c701a7a5e6b524c6", + "rev": "ff2af6f7ebc6c123603d5689aeea6461290f46b5", "type": "github" }, "original": { @@ -441,13 +277,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1775034801, - "narHash": "sha256-tsecHNsWwr4wSaM2oW9GwafMwE24J+xD8bKDoto3exY=", + "lastModified": 1775403759, + "narHash": "sha256-cGyKiTspHEUx3QwAnV3RfyT+VOXhHLs+NEr17HU34Wo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8d029aa64915e54b7846873d9583af4c9fd21ea4", + "rev": "5e11f7acce6c3469bef9df154d78534fa7ae8b6c", "type": "github" }, "original": { @@ -457,13 +293,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -473,75 +309,10 @@ "type": "github" } }, - "noctalia": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "noctalia-qs": "noctalia-qs" - }, - "locked": { - "lastModified": 1775039613, - "narHash": "sha256-5VzBe0SOXamABAbtjNF5Y7jaMbSeVtGQRhbICoJ6izo=", - "owner": "noctalia-dev", - "repo": "noctalia-shell", - "rev": "7b29c11d7aaf476723af14865665cf04750f8d20", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-shell", - "type": "github" - } - }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "noctalia", - "nixpkgs" - ], - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1774994931, - "narHash": "sha256-WmXA8kyqvDA226DRPrXyR6bLO9VsRr4SUAYCVH6H6Ns=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "b053facf8421df220d0bf2496a543b23dee3ca85", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "type": "github" - } - }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775058551, - "narHash": "sha256-Z70P71AjzGq1dUpJYrb2WZUiuF1e2GjGXEZBzYAxhY4=", - "owner": "nix-community", - "repo": "NUR", - "rev": "049fe91a62fbadf5977015d38136bc34d87d6c4b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "preload-ng": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1768356181, @@ -557,65 +328,16 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "dms", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1766725085, - "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", - "ref": "refs/heads/master", - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "revCount": 715, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - }, - "original": { - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - } - }, - "quickshell_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1774950564, - "narHash": "sha256-KWU38p8zEtgFOL5KZoWeqWVv27uBFLX3N+Ih+TFs9/0=", - "ref": "refs/heads/master", - "rev": "d6122277409783377059be6399004eb090a6008e", - "revCount": 782, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - } - }, "root": { "inputs": { "aagl": "aagl", - "dms": "dms", - "dms-plugin-registry": "dms-plugin-registry", "home-manager": "home-manager", - "niri": "niri", "nix-cachyos-kernel": "nix-cachyos-kernel", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable_2", - "noctalia": "noctalia", - "nur": "nur", + "nixpkgs-stable": "nixpkgs-stable", "preload-ng": "preload-ng", - "quickshell": "quickshell_2", "shiru": "shiru", - "sops-nix": "sops-nix", "zen-browser": "zen-browser" } }, @@ -657,42 +379,7 @@ "type": "github" } }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1774910634, - "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -707,61 +394,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "noctalia", - "noctalia-qs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1773297127, - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1773622265, - "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "a879e5e0896a326adc79c474bf457b8b99011027", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -770,11 +402,11 @@ ] }, "locked": { - "lastModified": 1775021133, - "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", + "lastModified": 1775367672, + "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", + "rev": "33cd729244914f1e121477c5de148639c5e73c4a", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index ead20d6..0d51266 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -9,28 +9,11 @@ #chaotic.url = "github:lonerOrz/nyx-loner"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; - dms.url = "github:AvengeMedia/DankMaterialShell"; - niri.url = "github:sodiboo/niri-flake"; - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - dms-plugin-registry = { - url = "github:AvengeMedia/dms-plugin-registry"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; }; - nur = { - url = "github:nix-community/NUR"; - inputs.nixpkgs.follows = "nixpkgs"; - }; zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -39,22 +22,32 @@ url = "github:darkguibrine/shiru-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - noctalia = { - url = "github:noctalia-dev/noctalia-shell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #noctalia = { + # url = "github:noctalia-dev/noctalia-shell"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; + #dms.url = "github:AvengeMedia/DankMaterialShell"; + #niri.url = "github:sodiboo/niri-flake"; + #} + #dms-plugin-registry = { + # url = "github:AvengeMedia/dms-plugin-registry"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; + #quickshell = { + # url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; }; - outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,shiru ,preload-ng ,nix-cachyos-kernel ,aagl ,sops-nix ,dms ,quickshell ,dms-plugin-registry ,niri ,noctalia , ...} @ inputs: { + outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,shiru ,preload-ng ,nix-cachyos-kernel ,aagl , ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ ./configuration.nix - nur.modules.nixos.default preload-ng.nixosModules.default - niri.nixosModules.niri - sops-nix.nixosModules.sops + #niri.nixosModules.niri + #sops-nix.nixosModules.sops {services.preload-ng.enable = true;} #chaotic.nixosModules.default {imports = [ aagl.nixosModules.default ]; diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index bfa94d7..f732008 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -8,19 +8,19 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/a1eb89b4-3009-4524-af2b-24aeab2226b8"; + { device = "/dev/disk/by-uuid/adaa7917-2996-4cf5-9664-4832b1fc200b"; fsType = "btrfs"; options = [ "subvol=@" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A038-AF6E"; + { device = "/dev/disk/by-uuid/C5F0-5261"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; diff --git a/nixos/home.nix b/nixos/home.nix index fb37662..3677a3b 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -23,35 +23,35 @@ flakePath = "/etc/nixos"; }; - gtk = { - enable = true; - theme = { - name = "Adwaita-dark"; - package = pkgs.gnome-themes-extra; - }; - cursorTheme = { - name = "Adwaita"; - # package = pkgs.Adwaita-awcursors; - }; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; - "gtk-cursor-theme-name" = "Adwaita"; - }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; - Settings = ''gtk-cursor-theme-name=Adwaita''; - }; - }; - - qt = { - enable = true; - style = { - name = "adwaita-dark"; - }; - }; - - xdg.configFile."gtk-3.0/settings.ini".force = true; - xdg.configFile."gtk-4.0/settings.ini".force = true; + #gtk = { + # enable = true; + # theme = { + # name = "Adwaita-dark"; + # package = pkgs.gnome-themes-extra; + # }; + # cursorTheme = { + # name = "Adwaita"; + # # package = pkgs.Adwaita-awcursors; + # }; + # gtk3.extraConfig = { + # gtk-application-prefer-dark-theme = 1; + # "gtk-cursor-theme-name" = "Adwaita"; + # }; + # gtk4.extraConfig = { + # gtk-application-prefer-dark-theme = 1; + # Settings = ''gtk-cursor-theme-name=Adwaita''; + # }; + #}; +# + #qt = { + # enable = true; + # style = { + # name = "adwaita-dark"; + # }; + #}; +# + #xdg.configFile."gtk-3.0/settings.ini".force = true; + #xdg.configFile."gtk-4.0/settings.ini".force = true; }