simplify some things and remove some unused code

home/develop/devenv.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [devenv];
+}

home/develop/langs/c.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [clang-tools buckle gdb lldb];
+}

home/develop/langs/lua.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    nil
-    alejandra
+    stylua
+    lua-language-server
   ];
 }

home/develop/langs/nix.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [nil nixd alejandra nixfmt-rfc-style];
+}

home/develop/langs/zig.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [zig zls];
+}

home/profiles/default.nix

@@ -10,7 +10,6 @@
     "xun@kidney" = [
       ../.
       ./kidney
-      # inputs.nix-index-database.hmModules.nix-index
       {home.stateVersion = "24.05";}
     ];
     "xun@nixdesk" = [
@@ -19,11 +18,6 @@
       inputs.sops-nix.homeManagerModules.sops
       {home.stateVersion = "23.11";}
     ];
-    "xun@hopper" = [
-      ../.
-      ./hopper
-      {home.stateVersion = "23.11";}
-    ];
   };
 
   inherit (inputs.home-manager.lib) homeManagerConfiguration;
@@ -37,10 +31,6 @@ in {
         modules = homeImports."xun@nixdesk";
         inherit pkgs extraSpecialArgs;
       };
-      "xun@hopper" = homeManagerConfiguration {
-        modules = homeImports."xun@hopper";
-        inherit pkgs extraSpecialArgs;
-      };
     };
   };
 }

home/profiles/hopper/default.nix

@@ -1,20 +0,0 @@
-{...}: {
-  imports = [
-    ../../editors/nvim.nix
-    ../../terminal/shell/zsh.nix
-    ../../terminal/emulator/wezterm.nix
-
-    ../../programs/browsers/firefox
-
-    ../../programs/desktop
-    ../../programs/desktop/awesome
-
-    ../../programs/media
-    ../../programs/media/jellyfin.nix
-
-    ../../services/media/playerctl.nix
-
-    ../../services/system/polkit-agent.nix
-    ../../services/system/udiskie.nix
-  ];
-}

home/profiles/kidney/default.nix

@@ -4,29 +4,22 @@
   ...
 }: {
   imports = [
-    self.homeManagerModules.xun
     ../../editors/emacs.nix
     ../../editors/nvim.nix
-    # ../../terminal/shell/zsh.nix
-    # ../../terminal/programs
-    # ../../terminal/programs/lazygit.nix
-    # ../../develop
-    # ../../develop/small-misc.nix
-  ];
 
-  xun = {
-    develop = {
-      enable = true;
-    };
-    desktop = {
-      xdg.enable = true;
-    };
-    programs.terminal = {
-      shell.zsh.enable = true;
-      direnv.enable = true;
-      comma.enable = true;
-      tmux.enable = true;
-      irssi.enable = true;
-    };
-  };
+    ../../terminal/shell/zsh.nix
+    ../../terminal/programs/xdg.nix
+    ../../terminal/programs/direnv.nix
+    ../../terminal/programs/comma.nix
+    ../../terminal/programs/tmux.nix
+    ../../terminal/programs/irssi.nix
+
+    ../../develop/langs/nix.nix
+    ../../develop/tools.nix
+    ../../develop/devenv.nix
+
+    ../../terminal/programs/git.nix
+    ../../terminal/programs/github.nix
+    ../../terminal/programs/lazygit.nix
+  ];
 }

home/profiles/nixdesk/default.nix

@@ -4,44 +4,53 @@
   ...
 }: {
   imports = [
-    self.homeManagerModules.xun
-    # ./kanshi.nix
     ./defaults.nix
 
     ../../secrets
 
-    # ../../terminal
-    # ../../terminal/programs/zellij.nix
+    ../../terminal/shell/zsh.nix
+
+    ../../terminal/programs/xdg.nix
+    ../../terminal/programs/direnv.nix
+    ../../terminal/programs/tmux.nix
+    ../../terminal/programs/comma.nix
     ../../terminal/programs/zoxide.nix
     ../../terminal/programs/tdf.nix
-    # ../../terminal/programs/irssi.nix
+    ../../terminal/programs/irssi.nix
+    ../../terminal/programs/git.nix
+    ../../terminal/programs/github.nix
     ../../terminal/programs/lazygit.nix
-    # ../../terminal/programs/beets.nix
+
     ../../editors/emacs.nix
     ../../editors/nvim.nix
     ../../editors/vscode.nix
     ../../editors/jetbrains
     ../../editors/jetbrains/android-studio.nix
+
     ../../programs/browsers/firefox
     ../../programs/browsers/tor.nix
     ../../programs/browsers/chromium.nix
+
     ../../terminal/emulator/wezterm.nix
     ../../terminal/emulator/foot.nix
 
     # desktop
     ../../programs/desktop
-    # ../../programs/desktop/theme.nix
-    ../../programs/desktop/awesome
-    #../../programs/desktop/hyprland
     ../../programs/desktop/sway
 
     # development
     ../../develop/common.nix
+    ../../develop/tools.nix
+    ../../develop/docs.nix
+    ../../develop/devenv.nix
+
     ../../develop/langs/haskell.nix
     ../../develop/langs/rust.nix
     ../../develop/langs/uiua.nix
-    #../../develop
-    #../../develop/small-misc.nix
+    ../../develop/langs/nix.nix
+    ../../develop/langs/zig.nix
+    ../../develop/langs/lua.nix
+    ../../develop/langs/c.nix
 
     # programs
     ../../programs/misc/keepassxc.nix
@@ -64,14 +73,14 @@
     ../../programs/music/cmus.nix
     ../../programs/media
     ../../programs/media/jellyfin.nix
+
     # gaming
     ../../programs/games
-    # ../../programs/games/roblox.nix
-    # ../../programs/games/krunker.nix
+    ../../programs/games/roblox.nix
+    ../../programs/games/krunker.nix
     #../../programs/games/ludusavi.nix
 
     # ./dark.nix
-    # ./xundark.nix
 
     # media services
     ../../services/media/playerctl.nix
@@ -79,34 +88,6 @@
     ../../services/system/polkit-agent.nix
     ../../services/system/udiskie.nix # although i dont need this for usb memory, it is quite convenient for flashing qmk
   ];
-  xun = let
-    enabled = {enable = true;};
-  in {
-    desktop = {
-      xdg = enabled;
-    };
-    programs.terminal = {
-      shell.zsh = enabled;
-      direnv = enabled;
-      comma = enabled;
-      tmux = enabled;
-      irssi = enabled;
-    };
-    develop = {
-      enable = true;
-      docs = enabled;
-      lang = {
-        c = enabled;
-        zig = enabled;
-        lua = enabled;
-      };
-    };
-    gaming = {
-      krunker = enabled;
-      roblox.sobercookie = enabled;
-    };
-    # school.geogebra = enabled;
-  };
 
   qt = {
     enable = true;

home/profiles/nixdesk/kanshi.nix

@@ -1,7 +1,6 @@
 {
   services.kanshi = {
     enable = true;
-    # systemdTarget = "hyprland-session.target"; # default is sway
     settings = [
       {
         profile.name = "default";

home/profiles/nixdesk/xundark.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  gtk = {
-    enable = true;
-    iconTheme = {
-      name = "WhiteSur-dark";
-      package = pkgs.whitesur-icon-theme;
-    };
-  };
-
-  qt.enable = true;
-}

home/programs/desktop/awesome/config/main/error-handling.lua

@@ -1,30 +0,0 @@
--- {{{ Error handling
--- Check if awesome encountered an error during startup and fell back to
--- another config (This code will only ever execute for the fallback config)
-if awesome.startup_errors then
-	naughty.notify({
-		preset = naughty.config.presets.critical,
-		title = "Oops, there were errors during startup!",
-		text = awesome.startup_errors,
-	})
-end
-
--- Handle runtime errors after startup
-do
-	local in_error = false
-	awesome.connect_signal("debug::error", function(err)
-		-- Make sure we don't go into an endless error loop
-		if in_error then
-			return
-		end
-		in_error = true
-
-		naughty.notify({
-			preset = naughty.config.presets.critical,
-			title = "Oops, an error happened!",
-			text = tostring(err),
-		})
-		in_error = false
-	end)
-end
--- }}}

home/programs/desktop/awesome/config/main/layouts.lua

@@ -1,23 +0,0 @@
-local awful = require('awful')
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-awful.layout.layouts = {
-	awful.layout.suit.tile,
-	awful.layout.suit.fair,
-	awful.layout.suit.floating,
-	awful.layout.suit.tile.left,
-	awful.layout.suit.tile.bottom,
-	awful.layout.suit.tile.top,
-	-- awful.layout.suit.fair,
-	awful.layout.suit.fair.horizontal,
-	awful.layout.suit.spiral,
-	awful.layout.suit.spiral.dwindle,
-	awful.layout.suit.max,
-	awful.layout.suit.max.fullscreen,
-	awful.layout.suit.magnifier,
-	awful.layout.suit.corner.nw,
-	-- awful.layout.suit.corner.ne,
-	-- awful.layout.suit.corner.sw,
-	-- awful.layout.suit.corner.se,
-}
--- }}}

home/programs/desktop/awesome/config/rc.lua

@@ -1,614 +0,0 @@
--- If LuaRocks is installed, make sure that packages installed through it are
--- found (e.g. lgi). If LuaRocks is not installed, do nothing.
-pcall(require, "luarocks.loader")
--- Standard awesome library
-local gears = require("gears")
-local awful = require("awful")
-require("awful.autofocus")
--- Widget and layout library
-local wibox = require("wibox")
--- Theme handling library
-local beautiful = require("beautiful")
--- Notification library
-local naughty = require("naughty")
-local menubar = require("menubar")
-local hotkeys_popup = require("awful.hotkeys_popup")
--- Enable hotkeys help widget for VIM and other apps
--- when client with a matching name is opened:
-
-require("awful.hotkeys_popup.keys")
-
-require('main.error-handling')
-
-HOME = os.getenv"HOME"
-
--- {{{ Variable definitions
--- Themes define colours, icons, font and wallpapers.
-beautiful.init(string.format("%s/.config/awesome/themes/%s/theme.lua",
-	HOME,
-	"custom")
-)
-
-
--- This is used later as the default terminal and editor to run.
-terminal = "wezterm"
-editor = os.getenv("EDITOR") or "nvim"
-editor_cmd = terminal .. " -e " .. editor
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
-
--- load layouts
-require('main.layouts')
-
-
--- {{{ Menu
--- Create a launcher widget and a main menu
-myawesomemenu = {
-	{
-		"hotkeys",
-		function()
-			hotkeys_popup.show_help(nil, awful.screen.focused())
-		end,
-	},
-	{ "manual", terminal .. " -e man awesome" },
-	{ "edit config", editor_cmd .. " " .. awesome.conffile },
-	{ "restart", awesome.restart },
-	{
-		"quit",
-		function()
-			awesome.quit()
-		end,
-	},
-}
-
-mymainmenu = awful.menu({
-	items = {
-		{ "awesome", myawesomemenu, beautiful.awesome_icon },
-		{ "open terminal", terminal },
-	},
-})
-
--- Menubar configuration
-menubar.utils.terminal = terminal -- Set the terminal for applications that require it
--- }}}
-
--- {{{ Wibar
--- Create a textclock widget
-mytextclock = wibox.widget.textclock(' %a %m-%d %H:%M ', 1)
-
--- Create a wibox for each screen and add it
-local taglist_buttons = gears.table.join(
-	awful.button({}, 1, function(t)
-		t:view_only()
-	end),
-	awful.button({ modkey }, 1, function(t)
-		if client.focus then
-			client.focus:move_to_tag(t)
-		end
-	end),
-	awful.button({}, 3, awful.tag.viewtoggle),
-	awful.button({ modkey }, 3, function(t)
-		if client.focus then
-			client.focus:toggle_tag(t)
-		end
-	end),
-	awful.button({}, 4, function(t)
-		awful.tag.viewnext(t.screen)
-	end),
-	awful.button({}, 5, function(t)
-		awful.tag.viewprev(t.screen)
-	end)
-)
-
-local tasklist_buttons = gears.table.join(
-	awful.button({}, 1, function(c)
-		if c == client.focus then
-			c.minimized = true
-		else
-			c:emit_signal("request::activate", "tasklist", { raise = true })
-		end
-	end),
-	awful.button({}, 3, function()
-		awful.menu.client_list({ theme = { width = 250 } })
-	end),
-	awful.button({}, 4, function()
-		awful.client.focus.byidx(1)
-	end),
-	awful.button({}, 5, function()
-		awful.client.focus.byidx(-1)
-	end)
-)
-
-local function set_wallpaper(s)
-	-- Wallpaper
-	if beautiful.wallpaper then
-		local wallpaper = beautiful.wallpaper
-		-- If wallpaper is a function, call it with the screen
-		if type(wallpaper) == "function" then
-			wallpaper = wallpaper(s)
-		end
-		gears.wallpaper.maximized(wallpaper, s, true)
-	end
-end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
-screen.connect_signal("property::geometry", set_wallpaper)
-
-awful.screen.connect_for_each_screen(function(s)
-	-- Wallpaper
-	set_wallpaper(s)
-
-	-- Each screen has its own tag table.
-	awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
-
-	-- Create a promptbox for each screen
-	s.mypromptbox = awful.widget.prompt()
-	-- Create an imagebox widget which will contain an icon indicating which layout we're using.
-	-- We need one layoutbox per screen.
-	s.mylayoutbox = awful.widget.layoutbox(s)
-	s.mylayoutbox:buttons(gears.table.join(
-		awful.button({}, 1, function()
-			awful.layout.inc(1)
-		end),
-		awful.button({}, 3, function()
-			awful.layout.inc(-1)
-		end),
-		awful.button({}, 4, function()
-			awful.layout.inc(1)
-		end),
-		awful.button({}, 5, function()
-			awful.layout.inc(-1)
-		end)
-	))
-	-- Create a taglist widget
-	s.mytaglist = awful.widget.taglist({
-		screen = s,
-		filter = awful.widget.taglist.filter.all,
-		buttons = taglist_buttons,
-	})
-
-	-- Create a tasklist widget
-	s.mytasklist = awful.widget.tasklist{
-		screen = s,
-		filter = awful.widget.tasklist.filter.currenttags,
-		buttons = tasklist_buttons,
-	}
-
-	-- Create the wibox
-	s.mywibox = awful.wibar({ position = "top", screen = s })
-
-	-- Add widgets to the wibox
-	s.mywibox:setup({
-		layout = wibox.layout.align.horizontal,
-		{ -- Left widgets
-			layout = wibox.layout.fixed.horizontal,
-			s.mytaglist,
-			s.mypromptbox,
-		},
-		s.mytasklist, -- Middle widget
-		{ -- Right widgets
-			layout = wibox.layout.fixed.horizontal,
-			wibox.widget.systray(),
-			mytextclock,
-			s.mylayoutbox,
-		},
-	})
-end)
-
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(gears.table.join(
-	awful.button({}, 3, function()
-		mymainmenu:toggle()
-	end)
-	--awful.button({}, 4, awful.tag.viewnext),
-	--awful.button({}, 5, awful.tag.viewprev)
-))
--- }}}
-
-local function save_screenshot(args)
-	local ss = awful.screenshot(args)
-
-	local function notify(self)
-		naughty.notification {
-			title = self.file_name,
-			message = "Screenshot saved",
-			icon = self.surface,
-			icon_size = 128,
-		}
-	end
-
-	if args.auto_save_delay > 0 then
-		ss:connect_signal("file::saved", notify)
-	else
-		notify(ss)
-	end
-
-	return ss
-end
-
--- {{{ Key bindings
-
-globalkeys = gears.table.join(
---	awful.key({}, "Print", function ()
---		save_screenshot{
---			auto_save_delay = 0,
---			screen = awful.screen.focused(),
---			directory = string.format("%s/Pictures/Screenshots", HOME),
---		}
---	end),
---	awful.key({'Control'}, "Print", function ()
---		save_screenshot {
---			auto_save_delay = 0,
---			directory = string.format("%s/Pictures/Screenshots", HOME),
---		}
---	end),
---	awful.key({'Shift'}, 'Print', function ()
---		save_screenshot {
---			auto_save_delay = 0,
---			interactive = true,
---			directory = string.format("%s/Pictures/Screenshots", HOME),
---		}
---	end),
-	-- disable ctrl + ;
-	-- because it for some reason crashes firefox and electron
-	awful.key({ 'Control' }, ";", function() end),
-	-- multimedia keys
-	awful.key({}, "XF86AudioMute", function() awful.spawn('wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle') end),
-	awful.key({ modkey }, "XF86AudioMute", function() awful.spawn('wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle') end),
-	awful.key({}, "XF86AudioRaiseVolume", function() awful.spawn('wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 3%+') end),
-	awful.key({}, "XF86AudioLowerVolume", function() awful.spawn('wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 3%-') end),
-	--mpris (playerctl)
-	awful.key({}, "XF86AudioPlay", function() awful.spawn('playerctl play-pause') end),
-	awful.key({}, "XF86AudioStop", function() awful.spawn('playerctl stop') end),
-	awful.key({}, "XF86AudioNext", function() awful.spawn('playerctl next') end),
-	awful.key({}, "XF86AudioPrev", function() awful.spawn('playerctl previous') end),
-	--mpd (mpc)
-	awful.key({ modkey }, "XF86AudioPlay", function() awful.spawn('mpc toggle') end),
-	awful.key({ modkey }, "XF86AudioStop", function() awful.spawn('mpc stop') end),
-	awful.key({ modkey }, "XF86AudioNext", function() awful.spawn('mpc next') end),
-	awful.key({ modkey }, "XF86AudioPrev", function() awful.spawn('mpc prev') end),
-
-	awful.key({ modkey }, "s", hotkeys_popup.show_help, { description = "show help", group = "awesome" }),
-	awful.key({ modkey }, "Left", awful.tag.viewprev, { description = "view previous", group = "tag" }),
-	awful.key({ modkey }, "Right", awful.tag.viewnext, { description = "view next", group = "tag" }),
-	awful.key({ modkey }, "Escape", awful.tag.history.restore, { description = "go back", group = "tag" }),
-
-	awful.key({ modkey }, "j", function()
-		awful.client.focus.byidx(1)
-	end, { description = "focus next by index", group = "client" }),
-	awful.key({ modkey }, "k", function()
-		awful.client.focus.byidx(-1)
-	end, { description = "focus previous by index", group = "client" }),
-	awful.key({ modkey }, "w", function()
-		mymainmenu:show()
-	end, { description = "show main menu", group = "awesome" }),
-
-	-- Layout manipulation
-	awful.key({ modkey, "Shift" }, "j", function()
-		awful.client.swap.byidx(1)
-	end, { description = "swap with next client by index", group = "client" }),
-	awful.key({ modkey, "Shift" }, "k", function()
-		awful.client.swap.byidx(-1)
-	end, { description = "swap with previous client by index", group = "client" }),
-	awful.key({ modkey, "Control" }, "j", function()
-		awful.screen.focus_relative(1)
-	end, { description = "focus the next screen", group = "screen" }),
-	awful.key({ modkey, "Control" }, "k", function()
-		awful.screen.focus_relative(-1)
-	end, { description = "focus the previous screen", group = "screen" }),
-	awful.key({ modkey }, "u", awful.client.urgent.jumpto, { description = "jump to urgent client", group = "client" }),
-	awful.key({ modkey }, "Tab", function()
-		awful.client.focus.history.previous()
-		if client.focus then
-			client.focus:raise()
-		end
-	end, { description = "go back", group = "client" }),
-
-	-- Standard program
-	awful.key({ modkey }, "Return", function()
-		awful.spawn(terminal)
-	end, { description = "open a terminal", group = "launcher" }),
-	awful.key({ modkey, "Control" }, "r", awesome.restart, { description = "reload awesome", group = "awesome" }),
-	awful.key({ modkey, "Shift" }, "q", awesome.quit, { description = "quit awesome", group = "awesome" }),
-
-	awful.key({ modkey }, "l", function()
-		awful.tag.incmwfact(0.05)
-	end, { description = "increase master width factor", group = "layout" }),
-	awful.key({ modkey }, "h", function()
-		awful.tag.incmwfact(-0.05)
-	end, { description = "decrease master width factor", group = "layout" }),
-	awful.key({ modkey, "Shift" }, "h", function()
-		awful.tag.incnmaster(1, nil, true)
-	end, { description = "increase the number of master clients", group = "layout" }),
-	awful.key({ modkey, "Shift" }, "l", function()
-		awful.tag.incnmaster(-1, nil, true)
-	end, { description = "decrease the number of master clients", group = "layout" }),
-	awful.key({ modkey, "Control" }, "h", function()
-		awful.tag.incncol(1, nil, true)
-	end, { description = "increase the number of columns", group = "layout" }),
-	awful.key({ modkey, "Control" }, "l", function()
-		awful.tag.incncol(-1, nil, true)
-	end, { description = "decrease the number of columns", group = "layout" }),
-	awful.key({ modkey }, "space", function()
-		awful.layout.inc(1)
-	end, { description = "select next", group = "layout" }),
-	awful.key({ modkey, "Shift" }, "space", function()
-		awful.layout.inc(-1)
-	end, { description = "select previous", group = "layout" }),
-
-	awful.key({ modkey, "Control" }, "n", function()
-		local c = awful.client.restore()
-		-- Focus restored client
-		if c then
-			c:emit_signal("request::activate", "key.unminimize", { raise = true })
-		end
-	end, { description = "restore minimized", group = "client" }),
-
-	-- Prompt
-	awful.key({ modkey }, "r", function()
-		awful.screen.focused().mypromptbox:run()
-	end, { description = "run prompt", group = "launcher" }),
-
-	awful.key({ modkey }, "x", function()
-		awful.prompt.run({
-			prompt = "Run Lua code: ",
-			textbox = awful.screen.focused().mypromptbox.widget,
-			exe_callback = awful.util.eval,
-			history_path = awful.util.get_cache_dir() .. "/history_eval",
-		})
-	end, { description = "lua execute prompt", group = "awesome" }),
-	-- Menubar
-	awful.key({ modkey }, "p", function()
-		menubar.show()
-	end, { description = "show the menubar", group = "launcher" })
-)
-
-clientkeys = gears.table.join(
-	awful.key({ modkey }, "f", function(c)
-		c.fullscreen = not c.fullscreen
-		c:raise()
-	end, { description = "toggle fullscreen", group = "client" }),
-	awful.key({ modkey }, "q", function(c)
-		c:kill()
-	end, { description = "close", group = "client" }),
-	awful.key(
-		{ modkey, "Control" },
-		"space",
-		awful.client.floating.toggle,
-		{ description = "toggle floating", group = "client" }
-	),
-	awful.key({ modkey, "Control" }, "Return", function(c)
-		c:swap(awful.client.getmaster())
-	end, { description = "move to master", group = "client" }),
-	awful.key({ modkey }, "o", function(c)
-		c:move_to_screen()
-	end, { description = "move to screen", group = "client" }),
-	awful.key({ modkey }, "t", function(c)
-		c.ontop = not c.ontop
-	end, { description = "toggle keep on top", group = "client" }),
-	awful.key({ modkey }, "n", function(c)
-		-- The client currently has the input focus, so it cannot be
-		-- minimized, since minimized clients can't have the focus.
-		c.minimized = true
-	end, { description = "minimize", group = "client" }),
-	awful.key({ modkey }, "m", function(c)
-		c.maximized = not c.maximized
-		c:raise()
-	end, { description = "(un)maximize", group = "client" }),
-	awful.key({ modkey, "Control" }, "m", function(c)
-		c.maximized_vertical = not c.maximized_vertical
-		c:raise()
-	end, { description = "(un)maximize vertically", group = "client" }),
-	awful.key({ modkey, "Shift" }, "m", function(c)
-		c.maximized_horizontal = not c.maximized_horizontal
-		c:raise()
-	end, { description = "(un)maximize horizontally", group = "client" })
-)
-
--- Bind all key numbers to tags.
--- Be careful: we use keycodes to make it work on any keyboard layout.
--- This should map on the top row of your keyboard, usually 1 to 9.
-for i = 1, 9 do
-	globalkeys = gears.table.join(
-		globalkeys,
-		-- View tag only.
-		awful.key({ modkey }, "#" .. i + 9, function()
-			local screen = awful.screen.focused()
-			local tag = screen.tags[i]
-			if tag then
-				tag:view_only()
-			end
-		end, { description = "view tag #" .. i, group = "tag" }),
-		-- Toggle tag display.
-		awful.key({ modkey, "Control" }, "#" .. i + 9, function()
-			local screen = awful.screen.focused()
-			local tag = screen.tags[i]
-			if tag then
-				awful.tag.viewtoggle(tag)
-			end
-		end, { description = "toggle tag #" .. i, group = "tag" }),
-		-- Move client to tag.
-		awful.key({ modkey, "Shift" }, "#" .. i + 9, function()
-			if client.focus then
-				local tag = client.focus.screen.tags[i]
-				if tag then
-					client.focus:move_to_tag(tag)
-				end
-			end
-		end, { description = "move focused client to tag #" .. i, group = "tag" }),
-		-- Toggle tag on focused client.
-		awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function()
-			if client.focus then
-				local tag = client.focus.screen.tags[i]
-				if tag then
-					client.focus:toggle_tag(tag)
-				end
-			end
-		end, { description = "toggle focused client on tag #" .. i, group = "tag" })
-	)
-end
-
-clientbuttons = gears.table.join(
-	awful.button({}, 1, function(c)
-		c:emit_signal("request::activate", "mouse_click", { raise = true })
-	end),
-	awful.button({ modkey }, 1, function(c)
-		c:emit_signal("request::activate", "mouse_click", { raise = true })
-		awful.mouse.client.move(c)
-	end),
-	awful.button({ modkey }, 3, function(c)
-		c:emit_signal("request::activate", "mouse_click", { raise = true })
-		awful.mouse.client.resize(c)
-	end)
-)
-
--- Set keys
-root.keys(globalkeys)
--- }}}
-
--- {{{ Rules
--- Rules to apply to new clients (through the "manage" signal).
-awful.rules.rules = {
-	-- All clients will match this rule.
-	{
-		rule = {},
-		properties = {
-			border_width = beautiful.border_width,
-			border_color = beautiful.border_normal,
-			focus = awful.client.focus.filter,
-			raise = true,
-			keys = clientkeys,
-			buttons = clientbuttons,
-			screen = awful.screen.preferred,
-			placement = awful.placement.no_overlap + awful.placement.no_offscreen,
-		},
-	},
-
-	-- Floating clients.
-	{
-		rule_any = {
-			instance = {
-				"DTA", -- Firefox addon DownThemAll.
-				"copyq", -- Includes session name in class.
-				"pinentry",
-			},
-			class = {
-				"Arandr",
-				"Blueman-manager",
-				"Gpick",
-				"Kruler",
-				"MessageWin", -- kalarm.
-				"Sxiv",
-				"Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
-				"Wpa_gui",
-				"veromix",
-				"xtightvncviewer",
-			},
-
-			-- Note that the name property shown in xprop might be set slightly after creation of the client
-			-- and the name shown there might not match defined rules here.
-			name = {
-				"Event Tester", -- xev.
-			},
-			role = {
-				"AlarmWindow", -- Thunderbird's calendar.
-				"ConfigManager", -- Thunderbird's about:config.
-				"pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
-			},
-		},
-		properties = { floating = true },
-	},
-
-	-- Add titlebars to normal clients and dialogs
-	--{ rule_any = { type = { "normal", "dialog" } }, properties = { titlebars_enabled = true } },
-
-	-- Set Firefox to always map on the tag named "2" on screen 1.
-	-- { rule = { class = "Firefox" },
-	--   properties = { screen = 1, tag = "2" } },
-	{
-		rule = {
-			name = "Steam Input On-screen Keyboard",
-		},
-		properties = {
-			focus = false
-		},
-	},
-}
--- }}}
-
--- {{{ Signals
--- Signal function to execute when a new client appears.
-client.connect_signal("manage", function(c)
-	-- Set the windows at the slave,
-	-- i.e. put it at the end of others instead of setting it master.
-	-- if not awesome.startup then awful.client.setslave(c) end
-
-	if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
-		-- Prevent clients from being unreachable after screen count changes.
-		awful.placement.no_offscreen(c)
-	end
-end)
-
--- Add a titlebar if titlebars_enabled is set to true in the rules.
-client.connect_signal("request::titlebars", function(c)
-	-- buttons for the titlebar
-	local buttons = gears.table.join(
-		awful.button({}, 1, function()
-			c:emit_signal("request::activate", "titlebar", { raise = true })
-			awful.mouse.client.move(c)
-		end),
-		awful.button({}, 3, function()
-			c:emit_signal("request::activate", "titlebar", { raise = true })
-			awful.mouse.client.resize(c)
-		end)
-	)
-
-	awful.titlebar(c):setup({
-		{ -- Left
-			awful.titlebar.widget.iconwidget(c),
-			buttons = buttons,
-			layout = wibox.layout.fixed.horizontal,
-		},
-		{ -- Middle
-			{ -- Title
-				align = "center",
-				widget = awful.titlebar.widget.titlewidget(c),
-			},
-			buttons = buttons,
-			layout = wibox.layout.flex.horizontal,
-		},
-		{ -- Right
-			awful.titlebar.widget.floatingbutton(c),
-			awful.titlebar.widget.maximizedbutton(c),
-			awful.titlebar.widget.stickybutton(c),
-			awful.titlebar.widget.ontopbutton(c),
-			awful.titlebar.widget.closebutton(c),
-			layout = wibox.layout.fixed.horizontal(),
-		},
-		layout = wibox.layout.align.horizontal,
-	})
-end)
-
--- Enable sloppy focus, so that focus follows mouse.
-client.connect_signal("mouse::enter", function(c)
-	c:emit_signal("request::activate", "mouse_enter", { raise = false })
-end)
-
-client.connect_signal("focus", function(c)
-	c.border_color = beautiful.border_focus
-end)
-client.connect_signal("unfocus", function(c)
-	c.border_color = beautiful.border_normal
-end)
--- }}}
-
-
-require('scripts.autorun')
-awful.spawn.once('bash -c '.. gears.filesystem.get_configuration_dir() .. '/scripts/autorun.sh')

home/programs/desktop/awesome/config/scripts/autorun.lua

@@ -1,5 +0,0 @@
-local naughty = require('naughty')
-local gears = require('gears')
-local awful = require('awful')
-
---naughty.notification({ text="hi" })

home/programs/desktop/awesome/config/scripts/autorun.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-xrandr --output DisplayPort-2 --mode 1920x1080 --rate 165 &
-/nix/store/$(ls -la /nix/store | grep polkit-gnome | grep '^d' | awk '{print $9}')/libexec/polkit-gnome-authentication-agent-1 &

home/programs/desktop/awesome/config/themes/custom/theme.lua

@@ -1,64 +0,0 @@
-local theme_assets = require'beautiful.theme_assets'
-local xresources = require'beautiful.xresources'
-local dpi = xresources.apply_dpi
-
-local gfs = require'gears.filesystem'
-
-local theme = {}
-
-theme.font = 'sans 8'
-
-theme.bg_normal		= "#161616"
-theme.bg_focus		= "#262626"
-theme.bg_urgent		= "#be95ff"
-theme.bg_minimize = "#393939"
-
-
-theme.fg_normal		= "#08bdba"
-theme.fg_focus		= "#ffffff"
-theme.fg_urgent		= "#ffffff"
-theme.fg_minimize = "#ffffff"
-
-theme.useless_gap	= dpi(1)
-theme.border_width  = dpi(1)
-theme.border_normal = "#262626"
-theme.border_focus  = "#be95ff"
-theme.border_marked = "#ee5396"
-
-
-
-local taglist_square_size = dpi(4)
-theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-	taglist_square_size, theme.fg_normal
-)
-theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-	taglist_square_size, theme.fg_normal
-)
-
-theme.wallpaper = os.getenv("HOME") .. "/wallpaper.png"
-
-theme.icon_theme = nil
-
-
-local themes_path = gfs.get_themes_dir()
-
-theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
-theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
-theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
-theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
-theme.layout_max = themes_path.."default/layouts/maxw.png"
-theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path.."default/layouts/tileleftw.png"
-theme.layout_tile = themes_path.."default/layouts/tilew.png"
-theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path.."default/layouts/spiralw.png"
-theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
-theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
-theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
-theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
-
-theme.notification_icon_size = 32
-
-return theme

home/programs/desktop/awesome/config/themes/default/README

@@ -1,3 +0,0 @@
-Background images:
-    Mikael Eriksson <mikael_eriksson@miffe.org>
-    Licensed under CC-BY-SA-3.0

home/programs/desktop/awesome/config/themes/default/theme.lua

@@ -1,132 +0,0 @@
----------------------------
--- Default awesome theme --
----------------------------
-
-local theme_assets = require("beautiful.theme_assets")
-local xresources = require("beautiful.xresources")
-local dpi = xresources.apply_dpi
-
-local gfs = require("gears.filesystem")
-local themes_path = gfs.get_themes_dir()
-
-local theme = {}
-
-
-theme.font          = "sans 8"
-
-theme.bg_normal     = "#222222"
-theme.bg_focus      = "#535d6c"
-theme.bg_urgent     = "#ff0000"
-theme.bg_minimize   = "#444444"
-theme.bg_systray    = theme.bg_normal
-
-theme.fg_normal     = "#aaaaaa"
-theme.fg_focus      = "#ffffff"
-theme.fg_urgent     = "#ffffff"
-theme.fg_minimize   = "#ffffff"
-
-theme.useless_gap   = dpi(0)
-theme.border_width  = dpi(1)
-theme.border_normal = "#000000"
-theme.border_focus  = "#535d6c"
-theme.border_marked = "#91231c"
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
--- tasklist_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- mouse_finder_[color|timeout|animate_timeout|radius|factor]
--- prompt_[fg|bg|fg_cursor|bg_cursor|font]
--- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font]
--- Example:
---theme.taglist_bg_focus = "#ff0000"
-
--- Generate taglist squares:
-local taglist_square_size = dpi(4)
-theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-    taglist_square_size, theme.fg_normal
-)
-theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-    taglist_square_size, theme.fg_normal
-)
-
--- Variables set for theming notifications:
--- notification_font
--- notification_[bg|fg]
--- notification_[width|height|margin]
--- notification_[border_color|border_width|shape|opacity]
-
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = themes_path.."default/submenu.png"
-theme.menu_height = dpi(15)
-theme.menu_width  = dpi(100)
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.bg_widget = "#cc0000"
-
--- Define the image to load
-theme.titlebar_close_button_normal = themes_path.."default/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = themes_path.."default/titlebar/close_focus.png"
-
-theme.titlebar_minimize_button_normal = themes_path.."default/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path.."default/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = themes_path.."default/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path.."default/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path.."default/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = themes_path.."default/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = themes_path.."default/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path.."default/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path.."default/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = themes_path.."default/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = themes_path.."default/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path.."default/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path.."default/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = themes_path.."default/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = themes_path.."default/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path.."default/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/maximized_focus_active.png"
-
-theme.wallpaper = os.getenv("HOME") .. "/Desktop/wallpaper-aster2.png" --themes_path.."default/background.png"
-
--- You can use your own layout icons like this:
-theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
-theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
-theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
-theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
-theme.layout_max = themes_path.."default/layouts/maxw.png"
-theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path.."default/layouts/tileleftw.png"
-theme.layout_tile = themes_path.."default/layouts/tilew.png"
-theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path.."default/layouts/spiralw.png"
-theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
-theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
-theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
-theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
-
--- Generate Awesome icon:
-theme.awesome_icon = theme_assets.awesome_icon(
-    theme.menu_height, theme.bg_focus, theme.fg_focus
-)
-
--- Define the icon theme for application icons. If not set then the icons
--- from /usr/share/icons and /usr/share/icons/hicolor will be used.
-theme.icon_theme = nil
-
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

home/programs/desktop/awesome/default.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  xsession.windowManager.awesome = {
-    enable = true;
-    noArgb = true;
-    luaModules = with pkgs; [
-      luaPackages.fennel
-    ];
-  };
-  xdg.configFile."awesome" = {
-    source = ./config;
-  };
-}

home/programs/desktop/hyprland/default.nix

@@ -1,344 +0,0 @@
-{
-  pkgs,
-  lib,
-  osConfig,
-  config,
-  ...
-}: {
-  imports = [
-    ../common/fuzzel.nix
-  ];
-
-  home.packages = with pkgs; [
-    wl-clipboard
-  ];
-
-  services.cliphist = {
-    enable = true;
-    systemdTarget = "hyprland-session.target";
-    extraOptions = ["-max-items" "150"];
-  };
-  #systemd.user.services.cliphist = {
-  #  Unit = {
-  #    Description = "Wayland clipboard manager";
-  #    PartOf = ["hyprland-session.target"];
-  #    After = ["hyprland-session.target"];
-  #  };
-
-  #  Service = {
-  #    ExecStartPre = "${pkgs.wl-clipboard}/wl-paste --type text --watch ${lib.getExe pkgs.cliphist} store #Stores only text data";
-  #    ExecStart = "${pkgs.wl-clipboard}/wl-paste --type image --watch ${lib.getExe pkgs.cliphist} store #Stores only image data";
-  #    ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
-  #    Restart = "on-failure";
-  #  };
-
-  #  Install = {
-  #    WantedBy = ["hyprland-session.target"];
-  #  };
-  #};
-
-  programs.waybar = {
-    enable = true;
-    style = ''
-      * {
-        font-family: monospace;
-        font-size: 13px;
-      }
-
-      window#waybar {
-          background-color: #181818;
-          color: #ffffff;
-          transition-property: background-color;
-          transition-duration: .5s;
-      }
-
-      window#waybar.hidden {
-          opacity: 0.2;
-      }
-
-      button {
-          /* Avoid rounded borders under each button name */
-          border: none;
-          border-radius: 0;
-      }
-
-      /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-      button:hover {
-          background: inherit;
-      }
-
-      #workspaces button {
-          padding: 0 5px;
-          background-color: transparent;
-          color: #ffffff;
-      }
-
-      #workspaces button:hover {
-          background: rgba(255, 255, 255, 0.1);
-      }
-
-      #workspaces button.focused {
-          background-color: #64727D;
-      }
-
-      #workspaces button.urgent {
-          background-color: #eb4d4b;
-      }
-
-      #workspaces button.visible {
-        color: #fd4dff;
-        background-color: #202020;
-      }
-
-      #clock,
-      #network,
-      #pulseaudio,
-      #wireplumber,
-      #tray {
-          padding: 0 10px;
-          color: #ffffff;
-      }
-
-      #window,
-      #workspaces {
-          margin: 0 4px;
-      }
-      /* If workspaces is the leftmost module, omit left margin */
-      .modules-left > widget:first-child > #workspaces {
-          margin-left: 0;
-      }
-
-      /* If workspaces is the rightmost module, omit right margin */
-      .modules-right > widget:last-child > #workspaces {
-          margin-right: 0;
-      }
-      @keyframes blink {
-          to {
-              background-color: #ffffff;
-              color: #000000;
-          }
-      }
-      label:focus {
-          background-color: #000000;
-      }
-      #tray {
-          background-color: #242424;
-      }
-
-      #tray > .passive {
-          -gtk-icon-effect: dim;
-      }
-
-      #tray > .needs-attention {
-          -gtk-icon-effect: highlight;
-          background-color: #eb4d4b;
-      }
-
-    '';
-    settings = [
-      {
-        "height" = 24;
-        "spacing" = 4;
-        "modules-left" = [
-          "hyprland/workspaces"
-          #"hyprland/mode"
-          #"hyprland/scratchpad"
-        ];
-        "modules-center" = [
-          "hyprland/window"
-        ];
-        "modules-right" = [
-          "pulseaudio"
-          "clock"
-          "tray"
-        ];
-
-        "hyprland/workspaces" = {
-          "format" = "[{icon} {windows}]";
-          "format-window-separator" = ",";
-          "window-rewrite-default" = "@";
-          "window-rewrite" = {
-            "title<.*discord.*>" = "d";
-            "class<Sonixd>" = "m";
-            "class<firefox>" = "f";
-            "foot" = "t";
-          };
-        };
-
-        "tray" = {
-          "spacing" = 10;
-        };
-        "clock" = {
-          "tooltim-format" = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
-          "format-alt" = "{:%a %Y-%m-%d}";
-        };
-        "pulseaudio" = {
-          "format" = "{volume}%";
-          "format-source" = "{volume}%";
-          "format-source-muted" = "";
-          "format-icons" = {
-            "headphone" = "";
-            "hands-free" = "";
-            "headset" = "";
-            "phone" = "";
-            "portable" = "";
-            "car" = "";
-            "default" = ["" "" ""];
-          };
-          "on-click" = "${lib.getExe pkgs.pavucontrol}";
-          "on-click-middle" = "${lib.getExe pkgs.helvum}";
-        };
-      }
-    ];
-    systemd = {
-      enable = true;
-      target = "hyprland-session.target";
-    };
-  };
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    settings = {
-      exec-once = [
-        #"${lib.getExe pkgs.xwaylandvideobridge}"
-        "${lib.getExe pkgs.swaybg} -i ${config.xdg.userDirs.pictures}/wallpaper"
-      ];
-      env = [
-        "NIXOS_OZONE_WL,1" # for any ozone-based browser & electron apps to run on wayland
-        "MOZ_ENABLE_WAYLAND,1" # for firefox to run on wayland
-        "MOZ_WEBRENDER,1"
-        # misc
-        "_JAVA_AWT_WM_NONREPARENTING,1"
-        "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
-        "QT_QPA_PLATFORM,wayland"
-        "SDL_VIDEODRIVER,wayland"
-        "GDK_BACKEND,wayland"
-      ];
-
-      input = {
-        kb_layout = osConfig.services.xserver.xkb.layout;
-      };
-
-      general = {
-        gaps_out = 3;
-        gaps_in = 3;
-        "col.active_border" = "rgb(feafff) rgb(fd56ff)";
-      };
-
-      dwindle = {
-        preserve_split = true;
-      };
-
-      workspace = [
-        "1,monitor:DP-3"
-        "2,monitor:DP-3"
-        "3,monitor:DP-3"
-        "4,monitor:DP-3"
-        "5,monitor:DP-3"
-
-        "11,defaultName:q,monitor:HDMI-A-1"
-        "12,defaultName:w,monitor:HDMI-A-1"
-        "13,defaultName:e,monitor:HDMI-A-1"
-        "14,defaultName:r,monitor:HDMI-A-1"
-        "15,defaultName:t,monitor:HDMI-A-1"
-      ];
-
-      animation = [
-        "workspaces,1,3,default"
-        "windows,1,3,default"
-        "border,1,3,default"
-      ];
-
-      "$mainMod" = "SUPER";
-      bind = [
-        "$mainMod, RETURN, exec, ${lib.getExe pkgs.foot}"
-        "$mainMod, G, killactive"
-        "$mainMod, SPACE, togglefloating"
-        "$mainMod, F, fullscreen"
-        "$mainMod, M, fullscreen, 1"
-        "$mainMod SHIFT, F, fakefullscreen"
-        "$mainMod, P, exec, ${lib.getExe pkgs.fuzzel}"
-        "$mainMod SHIFT, V, exec, ${lib.getExe pkgs.cliphist} list | ${lib.getExe pkgs.wofi} --dmenu | ${lib.getExe pkgs.cliphist} decode | ${pkgs.wl-clipboard}/bin/wl-copy"
-        "$mainMod SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --freeze copy area"
-        "$mainMod SHIFT, BACKSPACE, exec, systemctl suspend"
-
-        "$mainMod, N, togglesplit"
-        "$mainMod SHIFT, N, swapsplit"
-        # preselect with mirrored vim keys, shifted down
-        "$mainMod, B, layoutmsg, preselect r"
-        "$mainMod, V, layoutmsg, preselect d"
-        "$mainMod, C, layoutmsg, preselect u"
-        "$mainMod, X, layoutmsg, preselect l"
-
-        "$mainMod SHIFT, O, exec, ${lib.getExe pkgs.wlogout}"
-        # focus with vim keys
-        "$mainMod, h, movefocus, l"
-        "$mainMod, j, movefocus, d"
-        "$mainMod, k, movefocus, u"
-        "$mainMod, l, movefocus, r"
-        # window move with vim keys
-        "$mainMod SHIFT, h, movewindow, l"
-        "$mainMod SHIFT, j, movewindow, d"
-        "$mainMod SHIFT, k, movewindow, u"
-        "$mainMod SHIFT, l, movewindow, r"
-
-        # switch workspace with mod+[0-9]
-        "$mainMod, 1, workspace, 1"
-        "$mainMod, 2, workspace, 2"
-        "$mainMod, 3, workspace, 3"
-        "$mainMod, 4, workspace, 4"
-        "$mainMod, 5, workspace, 5"
-
-        "$mainMod, q, workspace, 11"
-        "$mainMod, w, workspace, 12"
-        "$mainMod, e, workspace, 13"
-        "$mainMod, r, workspace, 14"
-        "$mainMod, t, workspace, 15"
-
-        # move window to workspace with mod+shift+[0-9]
-        "$mainMod SHIFT, 1, movetoworkspace, 1"
-        "$mainMod SHIFT, 2, movetoworkspace, 2"
-        "$mainMod SHIFT, 3, movetoworkspace, 3"
-        "$mainMod SHIFT, 4, movetoworkspace, 4"
-        "$mainMod SHIFT, 5, movetoworkspace, 5"
-
-        "$mainMod SHIFT, q, movetoworkspace, 11"
-        "$mainMod SHIFT, w, movetoworkspace, 12"
-        "$mainMod SHIFT, e, movetoworkspace, 13"
-        "$mainMod SHIFT, r, movetoworkspace, 14"
-        "$mainMod SHIFT, t, movetoworkspace, 15"
-
-        # scroll through workspaces with mod+scroll
-        "$mainMod, mouse_down, workspace, e+1"
-        "$mainMod, mouse_up, workspace, e-1"
-        ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause"
-        ", XF86AudioStop, exec, ${lib.getExe pkgs.playerctl} stop"
-        ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next"
-        ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous"
-      ];
-      bindm = [
-        # mod+lbm/rmb for move/resize
-        "$mainMod, mouse:272, movewindow"
-        "$mainMod, mouse:273, resizewindow"
-      ];
-      binde = [
-        ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 3%+"
-        ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 3%-"
-      ];
-      windowrulev2 = [
-        # Allow hiding xwaylandvideobridge window correctly
-        "opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
-        "noanim,class:^(xwaylandvideobridge)$"
-        "noinitialfocus,class:^(xwaylandvideobridge)$"
-        "maxsize 1 1,class:^(xwaylandvideobridge)$"
-        "noblur,class:^(xwaylandvideobridge)$"
-
-        "noanim,title:^(XtMapper)$"
-        "noblur,title:^(XtMapper)$"
-        "float,title:^(XtMapper)$"
-        "move 0 0,title:^(XtMapper)$"
-        "size 100%,title:^(XtMapper)$"
-      ];
-    };
-  };
-}

home/programs/games/roblox.nix

@@ -1,10 +1,10 @@
 {
-  self,
+  inputs,
   pkgs,
   ...
 }: {
   # i have sober installed imperatively through flatpak
   home.packages = [
-    self.packages.${pkgs.system}.sobercookie
+    inputs.sobercookie.packages.${pkgs.system}.default
   ];
 }

home/terminal/programs/comma.nix

@@ -1,3 +1,12 @@
-{
-  programs.nix-index-database.comma.enable = true;
+{inputs, ...}: {
+  imports = [inputs.nix-index-database.hmModules.nix-index];
+
+  programs = {
+    nix-index-database.comma.enable = true;
+    nix-index = {
+      enableBashIntegration = false;
+      enableFishIntegration = false;
+      enableZshIntegration = false;
+    };
+  };
 }

home/terminal/programs/git.nix

@@ -18,6 +18,8 @@
     extraConfig = {
       gpg.format = "ssh";
       push.autoSetupRemote = true;
+      pull.rebase = true;
+      rebase.autostash = true;
     };
 
     userEmail = "xunuwu@gmail.com";

home/terminal/programs/tmux.nix

@@ -16,6 +16,9 @@
       set -g status-interval 5
       set -g status-right "#[fg=#25be6a]#(free -h | awk 'NR==2{print $3\"/\"$2}')"
       set -ag status-right  "#[fg=default] %a %d %b %H:%M"
+
+      set-option -g  default-terminal "xterm-256color"
+      set-option -ga terminal-overrides ",xterm-256color:Tc"
     '';
   };
 }

home/terminal/programs/zellij.nix

@@ -1,5 +0,0 @@
-{
-  programs.zellij = {
-    enable = true;
-  };
-}

home/terminal/shell/zsh.nix

@@ -1,6 +1,4 @@
 {config, ...}: {
-  programs.fzf.enable = true;
-
   programs.zsh = {
     enable = true;
     autocd = true;
@@ -11,6 +9,8 @@
 
     history = {
       expireDuplicatesFirst = true;
+      extended = true;
+      save = 100 * 1000;
       path = "${config.xdg.dataHome}/zsh_history";
     };
     initExtra = ''
@@ -41,13 +41,31 @@
 
 
       ## PROMPT ##
+      function preexec() {
+        timer=$(date +%s%3N)
+      }
+
+      function precmd_timer() {
+        if [ $timer ]; then
+          now=$(date +%s%3N)
+          elapsed=$(($now-$timer))
+
+          if [[ elapsed -gt 100 ]]; then
+            export RPROMPT="%F{cyan}''${elapsed}ms %f"
+          else
+            unset RPROMPT
+          fi
+          unset timer
+        fi
+      }
+
       autoload -Uz vcs_info
       precmd_vcs_info() { vcs_info }
-      precmd_functions+=( precmd_vcs_info )
+      precmd_functions+=( precmd_vcs_info precmd_timer )
       zstyle ':vcs_info:git:*' formats ' %b '
       setopt prompt_subst
 
-      PROMPT="%F{blue}[%F{magenta}%n%F{blue}@%F{magenta}%M%F{blue}] %~%f %F{green}\$vcs_info_msg_0_%f%(?..%F{red}| %? )%#%f "
+      PROMPT='%F{blue}[%F{magenta}%n%F{blue}@%F{magenta}%M%F{blue}] %~%f %F{green}$vcs_info_msg_0_%f%(?..%F{red}| %? )%#%f '
     '';
   };
 }