diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | flake.lock | 68 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | users/kassouni/desktop/xmonad/default.nix | 7 | ||||
| -rw-r--r-- | users/kassouni/desktop/xmonad/rofi.nix | 79 | ||||
| -rw-r--r-- | users/kassouni/desktop/xmonad/xbindkeys.nix | 32 | ||||
| -rw-r--r-- | users/kassouni/desktop/xmonad/xmonad.nix | 9 | ||||
| -rw-r--r-- | users/kassouni/fonts.nix | 2 | ||||
| -rw-r--r-- | users/kassouni/home.nix | 1 | ||||
| -rw-r--r-- | users/kassouni/palette/rebuild.nix | 1 |
10 files changed, 3 insertions, 203 deletions
@@ -1,7 +1,6 @@ .PHONY: rebuild format rebuild: - nix flake update xmonad-config sudo nixos-rebuild switch --flake . format: @@ -37,24 +37,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1785627969, - "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -157,21 +139,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1785031560, - "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1786106723, @@ -220,22 +187,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1787360063, - "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -265,8 +216,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "sidra": "sidra", - "slippi": "slippi", - "xmonad-config": "xmonad-config" + "slippi": "slippi" } }, "sidra": { @@ -325,22 +275,6 @@ "repo": "default", "type": "github" } - }, - "xmonad-config": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1787898838, - "narHash": "sha256-FYW+vDL/Aw4KGcyKz4Y26lQ9JpjAOVNBDGrEQlskaa4=", - "path": "/home/kassouni/Developer/xmonad-config", - "type": "path" - }, - "original": { - "path": "/home/kassouni/Developer/xmonad-config", - "type": "path" - } } }, "root": "root", @@ -7,7 +7,6 @@ home-manager.url = "github:nix-community/home-manager/release-26.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixvim.url = "github:nix-community/nixvim/nixos-26.05"; - xmonad-config.url = "path:/home/kassouni/Developer/xmonad-config"; sidra.url = "github:wimpysworld/sidra"; slippi.url = "github:lytedev/slippi-nix"; slippi.inputs.nixpkgs.follows = "nixpkgs"; @@ -25,7 +24,6 @@ nixpkgs-unstable, home-manager, nixvim, - xmonad-config, nixos-hardware, sidra, slippi, @@ -54,7 +52,6 @@ modules = [ ./machines/hierophant/configuration.nix ./machines/common - xmonad-config.nixosModules.default slippi.nixosModules.default home-manager.nixosModules.home-manager { @@ -70,7 +67,6 @@ imports = [ ./users/kassouni/home.nix nixvim.homeModules.nixvim - xmonad-config.homeManagerModules.default slippi.homeManagerModules.default ]; home.packages = [ sidra.packages.${pkgs.system}.default ]; @@ -89,7 +85,6 @@ modules = [ ./machines/magician/configuration.nix ./machines/common - xmonad-config.nixosModules.default nixos-hardware.nixosModules.framework-intel-core-ultra-series3 slippi.nixosModules.default home-manager.nixosModules.home-manager @@ -106,7 +101,6 @@ imports = [ ./users/kassouni/home.nix nixvim.homeModules.nixvim - xmonad-config.homeManagerModules.default slippi.homeManagerModules.default ]; home.packages = [ sidra.packages.${pkgs.system}.default ]; diff --git a/users/kassouni/desktop/xmonad/default.nix b/users/kassouni/desktop/xmonad/default.nix deleted file mode 100644 index d62dbe4..0000000 --- a/users/kassouni/desktop/xmonad/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - imports = [ - ./xmonad.nix - ./rofi.nix - ./xbindkeys.nix - ]; -} diff --git a/users/kassouni/desktop/xmonad/rofi.nix b/users/kassouni/desktop/xmonad/rofi.nix deleted file mode 100644 index 740047b..0000000 --- a/users/kassouni/desktop/xmonad/rofi.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ config, ... }: - -let - inherit (config.lib.formats.rasi) mkLiteral; - colors = config.colorScheme; -in -{ - programs.rofi = { - enable = true; - font = "${config.theme.font.family} ${builtins.toString config.theme.font.size}"; - - theme = { - "*" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral colors.editor.fg; - }; - - window = { - background-color = mkLiteral colors.ui.popup.bg; - border = mkLiteral "2px"; - border-color = mkLiteral colors.ui.line; - border-radius = mkLiteral "8px"; - padding = mkLiteral "16px"; - width = mkLiteral "40%"; - }; - - inputbar = { - children = map mkLiteral [ "prompt" "entry" ]; - background-color = mkLiteral colors.ui.panel.bg; - border-radius = mkLiteral "4px"; - padding = mkLiteral "8px"; - spacing = mkLiteral "8px"; - }; - - prompt = { - text-color = mkLiteral colors.common.accent.tint; - }; - - entry = { - placeholder = "Search"; - placeholder-color = mkLiteral colors.ui.fg; - }; - - listview = { - lines = 8; - scrollbar = false; - spacing = mkLiteral "2px"; - margin = mkLiteral "12px 0px 0px 0px"; - }; - - element = { - padding = mkLiteral "8px"; - border-radius = mkLiteral "4px"; - spacing = mkLiteral "8px"; - }; - - "element normal urgent" = { - text-color = mkLiteral colors.common.error; - }; - - "element normal active" = { - text-color = mkLiteral colors.common.accent.tint; - }; - - "element selected normal" = { - background-color = mkLiteral colors.common.accent.tint; - text-color = mkLiteral colors.surface.base; - }; - - element-icon = { - size = mkLiteral "1em"; - }; - - element-text = { - text-color = mkLiteral "inherit"; - }; - }; - }; -} diff --git a/users/kassouni/desktop/xmonad/xbindkeys.nix b/users/kassouni/desktop/xmonad/xbindkeys.nix deleted file mode 100644 index 41ef7ed..0000000 --- a/users/kassouni/desktop/xmonad/xbindkeys.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pkgs, ... }: -let - wpctl = "${pkgs.wireplumber}/bin/wpctl"; - - xbindkeysrc = pkgs.writeText "xbindkeysrc" '' - "${wpctl} set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+" - XF86AudioRaiseVolume - - "${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-" - XF86AudioLowerVolume - - "${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" - XF86AudioMute - ''; -in -{ - systemd.user.services.xbindkeys = { - Unit = { - Description = "xbindkeys"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - - Service = { - # -n keeps it in the foreground so systemd can supervise it - ExecStart = "${pkgs.xbindkeys}/bin/xbindkeys -n -f ${xbindkeysrc}"; - Restart = "on-failure"; - }; - - Install.WantedBy = [ "graphical-session.target" ]; - }; -} diff --git a/users/kassouni/desktop/xmonad/xmonad.nix b/users/kassouni/desktop/xmonad/xmonad.nix deleted file mode 100644 index d49dcc1..0000000 --- a/users/kassouni/desktop/xmonad/xmonad.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, config, ...}: { - xmonad-config = { - launcher = "rofi -show drun -show-icons"; - terminal = "ghostty"; - wallpaper = config.theme.desktop.wallpaper; - xmobar.font = config.theme.font; - }; -} - diff --git a/users/kassouni/fonts.nix b/users/kassouni/fonts.nix index 2cf25f6..f3dc396 100644 --- a/users/kassouni/fonts.nix +++ b/users/kassouni/fonts.nix @@ -7,6 +7,8 @@ home.packages = with pkgs; [ dejavu_fonts noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif openmoji-color ]; } diff --git a/users/kassouni/home.nix b/users/kassouni/home.nix index a5d7c85..b39fdaf 100644 --- a/users/kassouni/home.nix +++ b/users/kassouni/home.nix @@ -14,7 +14,6 @@ ./slippi.nix ./ssh.nix ./desktop/sway - ./desktop/xmonad ./rip.nix ./ayu/ayu-dark.nix ./git.nix diff --git a/users/kassouni/palette/rebuild.nix b/users/kassouni/palette/rebuild.nix index edffa6b..9a48268 100644 --- a/users/kassouni/palette/rebuild.nix +++ b/users/kassouni/palette/rebuild.nix @@ -12,7 +12,6 @@ exec ${pkgs.ghostty}/bin/ghostty -e bash -lc ' set -eu cd /home/kassouni/Developer/nixos-config - nix flake update xmonad-config sudo nixos-rebuild switch --flake . echo echo "Rebuild finished. Press enter to close." |