feat: downgrade to nixos-24.11

sioodmy · Jan 5, 2025 · 2992368 · 2992368
1 parent dfc89af
commit 2992368
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 79 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -45,7 +45,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     apple-silicon-support.url = "github:tpwrules/nixos-apple-silicon";
   };
 }
diff --git a/hosts/pandora/default.nix b/hosts/pandora/default.nix
@@ -23,36 +23,37 @@
     useExperimentalGPUDriver = true;
     experimentalGPUInstallMode = "replace";
   };
+  hardware.graphics.enable32Bit = lib.mkForce false;
 
   boot = {
     binfmt.emulatedSystems = ["x86_64-linux"];
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = lib.mkForce false;
     };
-    kernelPatches = [
-      {
-        name = "edge-config";
-        patch = null;
-        # derived from
-        # https://github.com/AsahiLinux/PKGBUILDs/blob/stable/linux-asahi/config.edge
-        extraConfig = ''
-          DRM_SIMPLEDRM_BACKLIGHT n
-          BACKLIGHT_GPIO n
-          DRM_APPLE m
-          APPLE_SMC m
-          APPLE_SMC_RTKIT m
-          APPLE_RTKIT m
-          APPLE_MBOX m
-          GPIO_MACSMC m
-          DRM_VGEM n
-          DRM_SCHED y
-          DRM_GEM_SHMEM_HELPER y
-          DRM_ASAHI m
-          SUSPEND y
-        '';
-      }
-    ];
+    # kernelPatches = [
+    #   {
+    #     name = "edge-config";
+    #     patch = null;
+    #     # derived from
+    #     # https://github.com/AsahiLinux/PKGBUILDs/blob/stable/linux-asahi/config.edge
+    #     extraConfig = ''
+    #       DRM_SIMPLEDRM_BACKLIGHT n
+    #       BACKLIGHT_GPIO n
+    #       DRM_APPLE m
+    #       APPLE_SMC m
+    #       APPLE_SMC_RTKIT m
+    #       APPLE_RTKIT m
+    #       APPLE_MBOX m
+    #       GPIO_MACSMC m
+    #       DRM_VGEM n
+    #       DRM_SCHED y
+    #       DRM_GEM_SHMEM_HELPER y
+    #       DRM_ASAHI m
+    #       SUSPEND y
+    #     '';
+    #   }
+    # ];
 
     initrd.availableKernelModules = ["usbhid" "usb_storage" "sd_mod"];
     initrd.kernelModules = ["usbhid" "dm-snapshot"];

diff --git a/system/fonts/default.nix b/system/fonts/default.nix
@@ -25,7 +25,8 @@ in {
           ;
       }
       ++ [
-        pkgs.nerd-fonts.jetbrains-mono
+        # pkgs.nerd-fonts.jetbrains-mono
+        (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];})
       ];
 
     enableDefaultPackages = false;

diff --git a/user/wrapped/nvim/_sources/generated.json b/user/wrapped/nvim/_sources/generated.json
@@ -19,26 +19,6 @@
         },
         "version": "16fc9c073e3ea4175b66ad94375df6d73fc114c0"
     },
-    "neotree": {
-        "cargoLocks": null,
-        "date": "2024-12-31",
-        "extract": null,
-        "name": "neotree",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "nvim-neo-tree",
-            "repo": "neo-tree.nvim",
-            "rev": "2a0b2c5d394a280cee9444c9894582ac53098604",
-            "sha256": "sha256-S/YbF7B/B76jdf6+Yf+uCsQqQTR+Yr72JzYmQTT4KJk=",
-            "type": "github"
-        },
-        "version": "2a0b2c5d394a280cee9444c9894582ac53098604"
-    },
     "nvim-base-16": {
         "cargoLocks": null,
         "date": "2024-05-23",

diff --git a/user/wrapped/nvim/_sources/generated.nix b/user/wrapped/nvim/_sources/generated.nix
@@ -13,18 +13,6 @@
     };
     date = "2024-05-16";
   };
-  neotree = {
-    pname = "neotree";
-    version = "2a0b2c5d394a280cee9444c9894582ac53098604";
-    src = fetchFromGitHub {
-      owner = "nvim-neo-tree";
-      repo = "neo-tree.nvim";
-      rev = "2a0b2c5d394a280cee9444c9894582ac53098604";
-      fetchSubmodules = false;
-      sha256 = "sha256-S/YbF7B/B76jdf6+Yf+uCsQqQTR+Yr72JzYmQTT4KJk=";
-    };
-    date = "2024-12-31";
-  };
   nvim-base-16 = {
     pname = "nvim-base-16";
     version = "6ac181b5733518040a33017dde654059cd771b7c";

diff --git a/user/wrapped/nvim/default.nix b/user/wrapped/nvim/default.nix
@@ -53,6 +53,7 @@
           indent-blankline-nvim-lua
           nvim-autopairs
           neoformat
+          neo-tree-nvim
           comment-nvim
           nvim-colorizer-lua
           which-key-nvim

diff --git a/user/wrapped/nvim/nvfetcher.toml b/user/wrapped/nvim/nvfetcher.toml
@@ -1,11 +1,3 @@
-[neotree]
-src.git="https://github.com/nvim-neo-tree/neo-tree.nvim"
-fetch.github="nvim-neo-tree/neo-tree.nvim"
-
-[telescope-orgmode]
-src.git="https://github.com/nvim-orgmode/telescope-orgmode.nvim"
-fetch.github="nvim-orgmode/telescope-orgmode.nvim"
-
 [nvim-base-16]
 src.git = "https://github.com/RRethy/nvim-base16"
 fetch.github = "RRethy/nvim-base16"

diff --git a/user/wrapped/waybar/style.nix b/user/wrapped/waybar/style.nix
@@ -46,11 +46,8 @@ in
       margin: 0px 7px;
       font-family: JetBrains Mono Nerd Font;
       transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.68);
-    }
-
-    #workspaces button:hover {
       color: #${theme.text};
-    };
+    }
 
     #workspaces button.urgent {
       color: #${theme.regular.red};