add emacs file, with its packages. kinda broken yet

configuration.nix

@@ -52,7 +52,7 @@
 
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
     publish = {
       enable = true;
       addresses = true;
@@ -84,8 +84,8 @@
   };
 
   # Enable automatic login for the user.
-  services.xserver.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "mir";
+  services.displayManager.autoLogin.user = "mir";
   # services.getty.autologinUser = "mir"
 
   # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1714264490,
+        "lastModified": 1716699938,
-        "narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=",
+        "narHash": "sha256-AzTYm22tTDJy0tSqMDf95rmCxxoGTPClu0paGPeh5a0=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc",
+        "rev": "842306255856d7f5677c113e699101eb253e2e3f",
         "type": "github"
       },
       "original": {
@@ -37,11 +37,11 @@
     "emacs-config": {
       "flake": false,
       "locked": {
-        "lastModified": 1711048799,
+        "lastModified": 1717275804,
-        "narHash": "sha256-GWKDJi+RMYKRW6n0P6dMbxjHzue4O/VbEsicMKiKpzs=",
+        "narHash": "sha256-88kQ/EQ90uGIZCqXo6SWDN/eirWrcTcMpgBUscDsAE8=",
         "ref": "main",
-        "rev": "946ea868eba978ab77d39597094dc5ce9534e3b2",
+        "rev": "3ea56aefe8e6713e63fa0d494bd05e1478fd9fd8",
-        "revCount": 521,
+        "revCount": 532,
         "type": "git",
         "url": "https://git.marq42.xyz/mir/emacs"
       },
@@ -106,16 +106,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1714043624,
+        "lastModified": 1717527182,
-        "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -127,11 +127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714343445,
+        "lastModified": 1717525419,
-        "narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=",
+        "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d",
+        "rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
         "type": "github"
       },
       "original": {
@@ -169,11 +169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714868057,
+        "lastModified": 1717036776,
-        "narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
+        "narHash": "sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0=",
         "ref": "refs/heads/main",
-        "rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
+        "rev": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb",
-        "revCount": 62,
+        "revCount": 86,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -184,27 +184,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701282334,
+        "lastModified": 1717179513,
-        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
+        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
+        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "23.11",
+        "ref": "24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1714253743,
+        "lastModified": 1717196966,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1714340308,
+        "lastModified": 1717532838,
-        "narHash": "sha256-2uX/VxxNTvxa0FZ5yY2BZDmMCtQVocqa6wdOC8YmzDE=",
+        "narHash": "sha256-EYWsxcHdS2YhG9BmZF2H8TSSHbOjYLAWsggA/SHuJc0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "53a8759e2675301db38ae5cc17aa9b954a936e9c",
+        "rev": "d7179450e2607764fd7f6d25894acec6d1ae44f9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
 {
   description = "NixOS configuration with Home Manager";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/24.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     apple-silicon = {
       url = "github:tpwrules/nixos-apple-silicon";
@@ -19,7 +19,7 @@
     };
     nur.url = github:nix-community/NUR;
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager-unstable = {
@@ -92,7 +92,7 @@
                 ./hardware/galvatron-hw.nix
                 ./modules/sound/pipewire.nix
                 inputs.apple-silicon.nixosModules.apple-silicon-support
-                inputs.home-manager-unstable.nixosModules.home-manager {
+                inputs.home-manager.nixosModules.home-manager {
                   home-manager.useGlobalPkgs = true;
                   home-manager.useUserPackages = true;
                   home-manager.users.mir = import ./home.nix;
@@ -100,7 +100,7 @@
                 }
               ]; # end of modules
             in
-              nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
+              nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
           breakdown = # {{{
             let 
               system = "x86_64-linux";
@@ -173,7 +173,7 @@
                 ./modules/droidcam-obs.nix # only this machine
                 ./hardware/knockout-hw.nix
                 ./modules/sound/pipewire.nix
-                inputs.home-manager-unstable.nixosModules.home-manager
+                inputs.home-manager.nixosModules.home-manager
                 {
                   home-manager.useGlobalPkgs = true;
                   home-manager.useUserPackages = true;
@@ -182,7 +182,7 @@
                 }
               ]; # end of modules
             in
-              inputs.nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
+              inputs.nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
 
           ravage = # {{{
 	          let 

home.nix

@@ -6,6 +6,7 @@ with lib.hm.gvariant;
     ./modules/dconf.nix
     ./modules/shell.nix
     ./modules/firefox.nix
+    # ./modules/emacs.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
@@ -16,6 +17,7 @@ with lib.hm.gvariant;
     pkgs.killall
     pkgs.gdb
     pkgs.neofetch
+    pkgs.fastfetch
     pkgs.file
     pkgs.findutils
     pkgs.wget
@@ -34,13 +36,6 @@ with lib.hm.gvariant;
         # pyqt6
         # # pyqt6-qt6
         # pyqt6-sip]))
-    # (pkgs.emacsWithPackagesFromUsePackage {
-    #   package = pkgs.emacs29-pgtk;
-    #   config = ~/.emacs.d/init.el;
-    # extraEmacsPackages = epkgs: [
-    #   epkgs.dash;
-    # ]
-    # })
     # pkgs.fetchFromGitHub
   ];
 
@@ -102,12 +97,12 @@ with lib.hm.gvariant;
   programs.hyfetch = {
     enable = true;
     settings = {
-      preset = "genderfluid";
+      preset = "nonbinary";
       mode = "rgb";
       color_align = {
 	mode = "horizontal";
       };
-      backend = "neofetch";
+      backend = "fastfetch";
     };
   };
 

modules/emacs.nix

@@ -0,0 +1,20 @@
+{ lib, config, pkgs, inputs, ... }:
+{
+  home.packages = [
+    (pkgs.emacsWithPackages {
+      package = pkgs.emacs29;
+      # config = ~/.emacs.d/init.el;
+    extraEmacsPackages = epkgs: [
+      epkgs.dash
+      epkgs.compat
+      epkgs.marginalia
+      epkgs.page-break-lines
+      epkgs.rainbow-mode
+      epkgs.powershell
+      epkgs.diminish
+      # epkgs.general
+      epkgs.eldoc
+    ];
+    }
+)];
+}

modules/firefox.nix

@@ -61,12 +61,14 @@
 	        default = "searx";
 	        order = [ "searx" "Google" ];
 	      };
-	# extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+	      # userChrome = ''
-	#   ublock-origin
+	      #   !important @import "~/.mozilla/safari-userchrome.css";
-	#   vimium
+	      # '';
-	#   mark-my-search
-	# ];
       };
     };
   };
-  }
+  home.file.".mozilla/safari-userchrome.css".source = builtins.fetchurl {
+    url = "https://gist.githubusercontent.com/janoamaral/5c0a6e944ca31d2a6a51712d0c453d48/raw/6e1f0d1e3e31400d467302da3198c3e9c3caa647/userChrome.css";
+    sha256 = "19hbf9kf93ggryabbxz5h9nsm2ymzjg369b8bld818a515cx4vhc";
+  };
+}