changes 9

boxes/xps.nix

@@ -12,7 +12,6 @@
     libsForQt5.kdenlive
     xdotool
     texlive.combined.scheme-full
-    zathura
     lilypond
     virt-manager
 #    virtualbox

common/desktop.nix

@@ -46,10 +46,8 @@ in {
     dunst
     libnotify
     tig
-    neomutt
     mpv
     yt-dlp
-    zathura
     tmux
     lynx
     feh
@@ -89,83 +87,17 @@ in {
     enableSSHSupport = true;
   };
 
-  programs.firefox = {
-    enable = true;
-    policies = {
-      DisableFirefoxStudies = true;
-      DisablePocket = true;
-      DisableTelemetry = {
-        Cryptomining = true;
-        Fingerprinting = true;
-        EmailTracking = true;
-      };
-      DisableFirefoxAccounts = true;
-      DisableFirefoxScreenshots = true;
-      DisableSetDesktopBackground = true;
-      DisplayBookmarksToolbar = "never";
-      DontCheckDefaultBrowser = true;
-      Extensions = {
-        Install = [
-          "https://addons.mozilla.org/firefox/downloads/file/3812704/umatrix-1.4.4.xpi"
-          "https://addons.mozilla.org/firefox/downloads/file/3824639/gruvbox_true_dark-2.0.xpi"
-          "https://addons.mozilla.org/firefox/downloads/file/4128489/darkreader-4.9.64.xpi"
-          "https://addons.mozilla.org/firefox/downloads/file/4036604/tridactyl_vim-1.23.0.xpi"
-          "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi"
-        ];
-      };
-      FirefoxHome = {
-        Pocket = false;
-        Snippets = false;
-        TopSites = false;
-        SponsoredTopSites = false;
-      };
-      UserMessaging = {
-        ExtensionRecommendations = false;
-        SkipOnboarding = true;
-        MoreFromMozilla = false;
-        UrlbarInterventions = false;
-        WhatsNew = false;
-      };
-      EnableTrackingProtection = true;
-      OverrideFirstRunPage = "";
-      OverridePostUpdatePage = "";
-      PasswordManagerEnabled = false;
-      SearchSuggestEnabled = false;
-    };
-    nativeMessagingHosts.packages = [
-      pkgs.tridactyl-native
-    ];
-  };
-
-  services.mpd = {
-    enable = true;
-    musicDirectory = "/home/usr/music";
-    user = "usr";
-    extraConfig = ''
-      audio_output {
-        type "pulse"
-        name "Pulseaudio"
-      }
-      audio_output {
-        type "alsa"
-        name "mpd alsamixer-output"
-      }
-    '';
-  };
-
   users.users.usr = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
     initialPassword = "usr";
     packages = with pkgs; [
-      firefox
       tree
       bspwm
       sxhkd
     ];
   };
 
-
   # honking impure, but who's counting anyway?
   system.activationScripts.test-script.text = ''
     #!${pkgs.bash}/bin/bash
@@ -185,6 +117,4 @@ in {
       text = "source /home/usr/.config/bash/bashrc";
     };
   };
-
-  programs.ssh.askPassword = "";
 }

flake.lock

@@ -1,5 +1,129 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "schizofox",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696343447,
+        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "schizofox",
+          "nixpak",
+          "hercules-ci-effects",
+          "hercules-ci-agent",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "haskell-flake": {
+      "locked": {
+        "lastModified": 1684780604,
+        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
+        "owner": "srid",
+        "repo": "haskell-flake",
+        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "ref": "0.3.0",
+        "repo": "haskell-flake",
+        "type": "github"
+      }
+    },
+    "hercules-ci-agent": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "haskell-flake": "haskell-flake",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1688568579,
+        "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5",
+        "type": "github"
+      },
+      "original": {
+        "id": "hercules-ci-agent",
+        "type": "indirect"
+      }
+    },
+    "hercules-ci-effects": {
+      "inputs": {
+        "flake-parts": [
+          "schizofox",
+          "nixpak",
+          "flake-parts"
+        ],
+        "hercules-ci-agent": "hercules-ci-agent",
+        "nixpkgs": [
+          "schizofox",
+          "nixpak",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1695684520,
+        "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,6 +145,53 @@
         "type": "github"
       }
     },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "schizofox",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696446489,
+        "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpak": {
+      "inputs": {
+        "flake-parts": [
+          "schizofox",
+          "flake-parts"
+        ],
+        "hercules-ci-effects": "hercules-ci-effects",
+        "nixpkgs": [
+          "schizofox",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696478570,
+        "narHash": "sha256-Zqktub0f4M8K0jDHFYaTwsGUddkH3UqHU0NNfGJmIKY=",
+        "owner": "nixpak",
+        "repo": "nixpak",
+        "rev": "271e01d3912c5c622ca7fa99d63d790bea980de0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixpak",
+        "repo": "nixpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1702921762,
@@ -37,10 +208,69 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1688322751,
+        "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1687627428,
+        "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "schizofox": "schizofox"
+      }
+    },
+    "schizofox": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "home-manager": "home-manager_2",
+        "nixpak": "nixpak",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nmd": "nmd"
+      },
+      "locked": {
+        "lastModified": 1696599936,
+        "narHash": "sha256-Ii4pYfSqmZL+A91FgZOS4v0jGODekh0vQYALiXgjvug=",
+        "owner": "schizofox",
+        "repo": "schizofox",
+        "rev": "f76d08268ea675dedb64e0cffa279c3194ceb803",
+        "type": "github"
+      },
+      "original": {
+        "owner": "schizofox",
+        "ref": "v0.0.1",
+        "repo": "schizofox",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -7,13 +7,17 @@
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    schizofox = {
+      url = "github:schizofox/schizofox/v0.0.1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs: {
     nixosConfigurations = {
       virtbox = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-#        specialArgs = inputs;
+        specialArgs = inputs;
         modules = [
           ./bootstrap.nix
           ./boxes/virtbox.nix

home/bash/default.nix

@@ -1,6 +1,12 @@
 { lib, config, pkgs, home, ... }:
 
 {
+  # if we use programs.bash.enable, it creates spurious .bashrc and .profile in
+  # our home directory, which is no good
+  home.packages = with pkgs; [
+    bash
+  ];
+
   home.file = {
     ".config/bash/bashrc" = {
       source = ./bashrc;

home/bspwm/default.nix

@@ -1,6 +1,8 @@
 { lib, config, pkgs, home, ... }:
 
 {
+  # program activation is managed by nixos config
+
   home.file = {
     ".config/bspwm/bspwmrc" = {
       source = ./bspwmrc;