diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 63f1fef..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.lock
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..6975e31
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,47 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1704383912,
+        "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1704194953,
+        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/home.nix b/home.nix
index 9f8fcd4..dc53db9 100644
--- a/home.nix
+++ b/home.nix
@@ -4,21 +4,26 @@
   home.username = "alice";
   home.homeDirectory = "/home/alice";
   
-  # stopgap, should be removed; sets nvim to default editor
-  home.sessionVariables.EDITOR = "nvim";
-
   home.stateVersion = "23.11";
   
   home.packages = with pkgs;
   [ texliveFull ] ++ # TeX distribution
   [ kitty ] ++ # Terminal emulator
-  [ firefox vifm pavucontrol ] ++ # Basic graphical apps
+  [ firefox cinnamon.nemo pavucontrol ] ++ # Basic graphical apps
   [ signal-desktop prismlauncher ] ++ # Personalized selection of graphical apps
   [ bemenu j4-dmenu-desktop ] ++ # Sway-related packages
   [ noto-fonts overpass ]; # Fonts
   
   programs.home-manager.enable = true;
   
+  # Having this enabled here means that environment variables get set correctly
+  programs.bash = {
+    enable = true;
+    # initExtra = ''
+    #   . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+    # '';
+  };
+
   programs.git = {
     enable = true;
     extraConfig = { init.defaultBranch = "main"; };
@@ -41,8 +46,13 @@
   
   # programs.waybar = import ./wayland/waybar.nix { inherit config lib pkgs; };
   
+  # Configure fonts
   fonts.fontconfig.enable = true;
-  
+  xdg.configFile = {
+    "fontconfig/conf.d/20-default-fonts.conf".source = ./config/20-default-fonts.conf;
+  };
+
+  # Enable and configure various apps
   programs.kitty = {
     enable = true;
     font = {
diff --git a/todo b/todo
index 113b84e..7e79303 100644
--- a/todo
+++ b/todo
@@ -2,3 +2,4 @@ enable NUR and firefox extensions
 split app configs off into separate files
 fix editor issue!!!
 switch to zsh
+fix brightness switching as non root
diff --git a/wayland/sway.nix b/wayland/sway.nix
index 714e7a7..a50ae54 100644
--- a/wayland/sway.nix
+++ b/wayland/sway.nix
@@ -20,7 +20,7 @@
       border = 2;
       titlebar = true;
     };
-    menu = "j4-dmenu-desktop --dmenu='bemenu -i'";
+    menu = "j4-dmenu-desktop --no-generic --term=kitty --dmenu='bemenu -i --fn Overpass 12 -H 20 -p \"\" -B 2 --hp 5'"; # I don't like hardcoding kitty here, TODO think of better way to do it
     focus.followMouse = false;
   };
   extraConfig =