update

flake.lock

@@ -53,11 +53,11 @@
     "base16-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1716150083,
+        "lastModified": 1731949548,
-        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
+        "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
         "owner": "tinted-theming",
         "repo": "base16-vim",
-        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+        "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728330715,
+        "lastModified": 1735644329,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
         "type": "github"
       },
       "original": {
@@ -105,6 +105,22 @@
         "type": "github"
       }
     },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734969791,
+        "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1696426674,
@@ -122,11 +138,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1696426674,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -143,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
+        "lastModified": 1736143030,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -182,11 +198,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1731533236,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -221,18 +237,45 @@
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735882644,
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "git-hooks_2": {
+      "inputs": {
+        "flake-compat": [
+          "stylix",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
         ],
         "nixpkgs-stable": [
-          "nixvim",
+          "stylix",
+          "git-hooks",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1732021966,
+        "lastModified": 1731363552,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
         "type": "github"
       },
       "original": {
@@ -263,19 +306,41 @@
         "type": "github"
       }
     },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1713702291,
+        "lastModified": 1732369855,
-        "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
+        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
+        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "46.1",
+        "ref": "47.2",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -287,11 +352,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732025103,
+        "lastModified": 1736785676,
-        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
+        "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
+        "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
         "type": "github"
       },
       "original": {
@@ -308,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732025103,
+        "lastModified": 1736508663,
-        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
+        "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
+        "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
         "type": "github"
       },
       "original": {
@@ -329,11 +394,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730837930,
+        "lastModified": 1735774425,
-        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+        "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+        "rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
         "type": "github"
       },
       "original": {
@@ -378,11 +443,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732016537,
+        "lastModified": 1736370755,
-        "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
+        "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
+        "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
         "type": "github"
       },
       "original": {
@@ -393,11 +458,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731890469,
+        "lastModified": 1736881310,
-        "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
+        "narHash": "sha256-5BlVeikKoJVrUXBdr1kSrcRQ8o20Kl+ZU2pEzpE5sUw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5083ec887760adfe12af64830a66807423a859a7",
+        "rev": "733994ea06585b76621073160e87b0bfac7fc5ae",
         "type": "github"
       },
       "original": {
@@ -409,11 +474,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1732014248,
+        "lastModified": 1736798957,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
         "type": "github"
       },
       "original": {
@@ -425,16 +490,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1731531548,
+        "lastModified": 1735648875,
-        "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
+        "narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "24f0d4acd634792badd6470134c387a3b039dace",
+        "rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -454,11 +519,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1732143099,
+        "lastModified": 1736961674,
-        "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=",
+        "narHash": "sha256-nuOFHtSUHYsb6PHueFF9KPLS8v+Wi+wGCXZCI+J54QI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c",
+        "rev": "54e6dbd8c83586d9553f61c21fa639b500e51f93",
         "type": "github"
       },
       "original": {
@@ -477,11 +542,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731936508,
+        "lastModified": 1735854821,
-        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
+        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
+        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
         "type": "github"
       },
       "original": {
@@ -505,22 +570,25 @@
         "base16-fish": "base16-fish",
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
+        "git-hooks": "git-hooks_2",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
         "nixpkgs": "nixpkgs_3",
         "systems": "systems_2",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
-        "tinted-tmux": "tinted-tmux"
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1732261424,
+        "lastModified": 1736955291,
-        "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=",
+        "narHash": "sha256-h5y11C4vMi8VoIVeHr/xFJO5N1nWKiKoAILPPUl7P/8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "b667a340730dd3d0596083aa7c949eef01367c62",
+        "rev": "2985ee9b2836a725b04628d24f934212b96eacbe",
         "type": "github"
       },
       "original": {
@@ -596,11 +664,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1696725902,
+        "lastModified": 1729501581,
-        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+        "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+        "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
         "type": "github"
       },
       "original": {
@@ -609,6 +677,22 @@
         "type": "github"
       }
     },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725758778,
+        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -617,11 +701,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732111664,
+        "lastModified": 1736154270,
-        "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=",
+        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0",
+        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,8 +2,11 @@
   description = "Ficache's system flake";
 
   inputs = {
+
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    
     envycontrol.url = "github:bayasdev/envycontrol";
+    
     stylix.url = "github:danth/stylix";
 
     home-manager = {
@@ -15,6 +18,7 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
@@ -24,7 +28,7 @@
     in {
 
       # ficache-nixos - system hostname
-      nixosConfigurations.ficache-nixos = nixpkgs.lib.nixosSystem {
+      nixosConfigurations.dixxe-nixos = nixpkgs.lib.nixosSystem {
         specialArgs = {
           nixpkgs.config.allowUnfree = true;
           inherit inputs system;
@@ -35,7 +39,7 @@
         ];
       };
 
-      homeConfigurations.ficache = home-manager.lib.homeManagerConfiguration {
+      homeConfigurations.dixxe = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.${system};
         modules = [ 
           ./home-manager/home.nix 

home-manager/home.nix

@@ -1,15 +1,15 @@
 {
 
   imports = [
-    ./package-groups/bundle.nix
+    ./package-groups/video-processing.nix
     ./your-modules.nix
     ./your-packages.nix
   ];
 
   home = {
     
-    username = "ficache";
+    username = "dixxe";
-    homeDirectory = "/home/ficache";
+    homeDirectory = "/home/dixxe";
     stateVersion = "24.05";
   
 

home-manager/modules/desktop-managers/gnomeModule.nix

@@ -0,0 +1,20 @@
+{pkgs, ...}:
+{
+  home.packages = with pkgs.gnomeExtensions; [
+    appindicator
+    dash-to-dock
+    media-controls
+  ];
+  
+  dconf = {
+    enable = true;
+    settings."org/gnome/shell" = {
+      disable-user-extensions = false;
+      enabled-extensions = with pkgs.gnomeExtensions; [
+        appindicator.extensionUuid
+        dash-to-dock.extensionUuid
+        media-controls.extensionUuid
+      ];
+    };
+  };
+}

home-manager/modules/gammastep.nix

@@ -1,8 +0,0 @@
-{
-    services.gammastep = {
-	    enable = true;
-	    latitude = 52.58;
-	    longitude = 36.3;
-
-    };
-}

home-manager/modules/helix.nix

@@ -7,6 +7,7 @@
     extraPackages = with pkgs; [
       marksman
       nil
+      gopls
     ];
     # Stylix have troubles with theme for helix right now.
   };

home-manager/modules/stylix.nix

@@ -1,13 +1,11 @@
 { pkgs, ... }:
 
 {
-    home.packages = [ pkgs.dconf ]; 
-
   stylix = {
     enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/eighties.yaml";
 
-    image = ../../wallpaper3.png;
+    image = ../../topography.png;
 
     cursor = {
       package = pkgs.oreo-cursors-plus;

home-manager/modules/syncthing.nix

@@ -2,6 +2,5 @@
 {
   services.syncthing = {
     enable = true;
-    tray.enable = true;
   };
 }

home-manager/modules/vscodium.nix

@@ -1,13 +1,37 @@
 { pkgs, ... }:
 {
-  programs.vscode = {
+  programs.vscode = 
+  {
     enable = true;
     package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions; [
+    extensions = with pkgs.vscode-extensions; 
+    [
       jnoortheen.nix-ide
-      ms-dotnettools.vscode-dotnet-runtime
-      ms-dotnettools.csharp
       golang.go
+      waderyan.gitblame
+      donjayamanne.githistory
+      samuelcolvin.jinjahtml
+      ziglang.vscode-zig
+    ];
+    userSettings = 
+    {
+      "terminal.integrated.defaultProfile.linux" = "null";
+      "terminal.integrated.shell.linux" = "/run/current-system/sw/bin/bash";
+      "files.autoSave" = "on";
+      "editor.minimap.enabled" = false;
+      "clangd.fallbackFlags" = [ 
+        "-Wall" 
+        "-Wextra" 
+        "-Wpedantic" 
+        "-Werror" 
+        "-I./includes"
+        ];
+      "editor.rulers" = [
+        {
+          "column" = 80;
+          "color" = "#ff9900";
+        }
       ];
     };
+  };
 }

home-manager/package-groups/bundle.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./video-processing.nix
-  ];
-}

home-manager/package-groups/video-processing.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
     programs.obs-studio = {
@@ -10,10 +10,10 @@
         ];
     };
 
-    home.packages = [
+    home.packages = with pkgs; [
-        
-        pkgs.jellyfin-ffmpeg
-        pkgs.libsForQt5.kdenlive
         
+        jellyfin-ffmpeg
+        gpu-screen-recorder-gtk
+        audacity        
     ];   
 }

home-manager/your-modules.nix

@@ -4,7 +4,8 @@
         ./modules/git.nix
         ./modules/stylix.nix
         ./modules/syncthing.nix
-        #./modules/helix.nix
+        ./modules/helix.nix
         ./modules/vscodium.nix
+        ./modules/desktop-managers/gnomeModule.nix
     ];
 }

home-manager/your-packages.nix

@@ -2,28 +2,28 @@
 
 {
     home.packages = with pkgs; [
-		obsidian
+        logseq
-        alacritty
+        joplin-desktop
         vlc
+        gnome-tweaks
 
         # Social stuff
         telegram-desktop
+        vesktop
+        element-desktop
         
-        firefox
+        librewolf
         qbittorrent
         libreoffice
+        gimp
         
         # Minecraft stuff
         prismlauncher
 
-        #Development stuff
-        krita
-        dotnetCorePackages.sdk_9_0
-        godot_4-mono
    ];
 
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    nixpkgs.config.permittedInsecurePackages = [
-        "obsidian"
+        "electron-27.3.11"
     ];
 
 }

nixos/hardware-configuration.nix

@@ -9,23 +9,29 @@
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS";
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9d35945a-2c1e-463d-b47a-545093d19de1";
+    { device = "/dev/disk/by-label/NIXOS_ROOT";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0894-A975";
+    { device = "/dev/disk/by-label/NIXOS_BOOT";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  fileSystems."/home" =
+    { device = "/dev/disk/by-label/NIXOS_HOME";
+      fsType = "ext4";
+    };
+
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/2a100390-c20d-4d74-804c-db52551b9d76"; }
+    [ { device = "/dev/disk/by-label/NIXOS_SWAP"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -36,5 +42,6 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.enableAllFirmware = true;
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

nixos/modules/desktop-enviroments/gnome.nix

@@ -1,9 +1,10 @@
-{ ... }:
+{ pkgs, lib, ... }:
 
 {
 	services = {
 		libinput.enable = true;
 		displayManager.defaultSession = "gnome";
+		power-profiles-daemon.enable = false;
 	};
 
   services.xserver = {
@@ -13,4 +14,44 @@
 			gnome.enable = true;
 		};
 	};
+
+	# Extensions are managed in gnomeModule.nix
+	# 
+	environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator ];
+	services.gnome.gnome-settings-daemon.enable = true;
+
+	environment.gnome.excludePackages = (with pkgs; [
+		atomix # puzzle game
+		cheese # webcam tool
+		epiphany # web browser
+		evince # document viewer
+		geary # email reader
+		gedit # text editor
+		gnome-characters
+		gnome-music
+		gnome-photos
+		gnome-terminal
+		gnome-tour
+		hitori # sudoku game
+		iagno # go game
+		tali # poker game
+		totem # video player
+	]);
+
+	nixpkgs.overlays = [
+    # GNOME 46: triple-buffering-v4-46
+    (final: prev: {
+      gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
+        mutter = gnomePrev.mutter.overrideAttrs (old: {
+          src = pkgs.fetchFromGitLab  {
+            domain = "gitlab.gnome.org";
+            owner = "vanvugt";
+            repo = "mutter";
+            rev = "triple-buffering-v4-46";
+            hash = "sha256-fkPjB/5DPBX06t7yj0Rb3UEuu5b9mu3aS+jhH18+lpI=";
+          };
+        });
+      });
+    })
+  ];
 }

nixos/modules/desktop-enviroments/plasma6.nix

@@ -14,10 +14,6 @@
 	services = {
 		libinput.enable = true;
 		
-    displayManager = {
-      sddm.enable = true;
-    };
-		
 		desktopManager = {
 				plasma6.enable = true;
 			};
@@ -27,5 +23,16 @@
 
   	services.xserver = {
 		enable = true;
+
+		displayManager = {
+			gdm.enable = true;
+			gdm.wayland = true;
 		};
+	};
+	
+	#qt = {
+	#	enable = true;
+	#	platformTheme = "gnome";
+	#	style = "adwaita-dark";
+	#};
 }

nixos/modules/gaming-tweaks.nix

@@ -3,7 +3,6 @@
 {
     programs.steam = {
         enable = true;
-        #extest.enable = true;
         remotePlay.openFirewall = true;
         dedicatedServer.openFirewall = true;
         localNetworkGameTransfers.openFirewall = true;
@@ -21,10 +20,6 @@
 
     environment.systemPackages = [
 
-        pkgs.lutris
-        pkgs.wineWowPackages.waylandFull
-        pkgs.winetricks
-
         pkgs.dxvk
         pkgs.mesa
         pkgs.mangohud

nixos/modules/hardware/nvidia.nix

@@ -16,9 +16,11 @@
 
 
   hardware.nvidia.prime = {
-    sync.enable = true;
+    #sync.enable = true;
+    #offload.enable = true;
+    reverseSync.enable = true;
     
     nvidiaBusId = "PCI:1:0:0";
-    amdgpuBusId = "PCI:4:2:0";
+    amdgpuBusId = "PCI:4:0:0";
   };
 }

nixos/modules/minimal/bootloader.nix

@@ -1,5 +1,9 @@
+{ pkgs, ...}:
 {
     # Bootloader.
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
+
+    boot.kernel.sysctl."kernel.sysrq" = 502; # Enable sysrq keys because FUCK YOU NVIDIA!!!
+    boot.plymouth.enable = true;
 }

nixos/modules/minimal/bundle.nix

@@ -7,5 +7,6 @@
         ./xkb-settings.nix
         ./users.nix
         ./garbage-collector.nix
+        ./kernel.nix
     ];
 }

nixos/modules/minimal/fonts.nix

@@ -2,7 +2,7 @@
 
 {
    fonts.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "Ubuntu" ]; })
+    nerd-fonts.ubuntu
     noto-fonts
     hack-font
   ];

nixos/modules/minimal/kernel.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}:
+{
+  #linux kernel
+  boot.kernelPackages = pkgs.linuxPackages_zen;
+}

nixos/modules/minimal/networking.nix

@@ -1,5 +1,5 @@
 {
-    networking.hostName = "ficache-nixos"; # Define your hostname.
+    networking.hostName = "dixxe-nixos"; # Define your hostname.
     # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.\
     networking.networkmanager.enable = true;
 }

nixos/modules/minimal/users.nix

@@ -1,8 +1,8 @@
 {
     # Define a user account. Don't forget to set a password with ‘passwd’.
-    users.users.ficache = {
+    users.users.dixxe = {
         isNormalUser = true;
-        description = "ficache";
+        description = "dixxe";
         extraGroups = [ "networkmanager" "wheel" "tpws" ];
     };
 }

nixos/modules/nix-ld.nix

@@ -0,0 +1,6 @@
+{...}:
+{
+  programs.nix-ld = {
+    enable = true;
+  };
+}

nixos/modules/pipewire.nix

@@ -1,5 +1,5 @@
 {
-    hardware.pulseaudio.enable = false;
+    services.pulseaudio.enable = false;
     security.rtkit.enable = true;
     services.pipewire = {
         enable = true;

nixos/modules/postgresql.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+{
+  services.postgresql = {
+    enable = true;
+    ensureDatabases = [ "mydatabase" ];
+    enableTCPIP = true;
+    # port = 5432;
+    authentication = pkgs.lib.mkOverride 10 ''
+      #...
+      #type database DBuser origin-address auth-method
+      local all       all     trust
+      # ipv4
+      host  all      all     127.0.0.1/32   trust
+      # ipv6
+      host all       all     ::1/128        trust
+    '';
+    initialScript = pkgs.writeText "backend-initScript" ''
+      CREATE ROLE nixcloud WITH LOGIN PASSWORD 'nixcloud' CREATEDB;
+      CREATE DATABASE nixcloud;
+      GRANT ALL PRIVILEGES ON DATABASE nixcloud TO nixcloud;
+    '';
+  };
+}

nixos/modules/virtualbox.nix

@@ -0,0 +1,9 @@
+{
+  programs.virt-manager.enable = true;
+
+  users.groups.libvirtd.members = ["dixxe"];
+
+  virtualisation.libvirtd.enable = true;
+
+  virtualisation.spiceUSBRedirection.enable = true; 
+}

nixos/modules/zapret.nix

@@ -3,6 +3,8 @@
     services = {
         zapret = {
             enable = true;
+            udpPorts = [ "50000:65535" "27000:27100" ];
+            udpSupport = true;
             params = [
                 "--dpi-desync-autottl=3"
                 "--wssize 1:6"
@@ -11,6 +13,10 @@
                 "--dpi-desync=syndata,fake,split2"
                 "--dpi-desync-repeats=6"
                 "--dpi-desync-fooling=md5sig"
+
+                "--dpi-desync=fake,split2"
+                "--dpi-desync-any-protocol"
+
                 "--new"
             ];
             whitelist = [
@@ -53,7 +59,7 @@
                 "7tv.app"
                 "7tv.io"
                 "10tv.app"
-                "x.com"
+                "dixxe.top"
             ];
         };
     };

nixos/modules/zerotierone.nix

@@ -2,7 +2,10 @@
 {
   services.zerotierone = {
         enable = true;
-        joinNetworks = [ "41d49af6c287fe2b" ];
+        joinNetworks = [ 
+          "41d49af6c287fe2b" 
+          "272f5eae16114dee" 
+          ];
   };
 }  
   

nixos/system-packages.nix

@@ -6,7 +6,6 @@
 
     environment.systemPackages = with pkgs; [
         inputs.envycontrol.packages.x86_64-linux.default
-	      pciutils
         home-manager
         nh
     ];

nixos/user_modules.nix

@@ -3,11 +3,14 @@
     ./modules/gaming-tweaks.nix
     ./modules/pipewire.nix
     ./modules/auto-cpufreq.nix
-    ./modules/zapret.nix
+    #./modules/zapret.nix
+    #./modules/virtualbox.nix
+    #./modules/postgresql.nix
+    #./modules/nix-ld.nix
     ./modules/zerotierone.nix
 
     ./modules/hardware/nvidia.nix
     ./modules/hardware/battery-threshold.nix
-    ./modules/desktop-enviroments/plasma6.nix
+    ./modules/desktop-enviroments/gnome.nix
   ];
 }