diff --git a/flake.lock b/flake.lock index 762c08d4..e99fac02 100644 --- a/flake.lock +++ b/flake.lock @@ -110,21 +110,6 @@ } }, "crane_2": { - "locked": { - "lastModified": 1732991615, - "narHash": "sha256-CgEHGXSzUdlRI1MzsZmWUwW8+6MKYqtCBIDrD/5H5/o=", - "owner": "ipetkov", - "repo": "crane", - "rev": "da87d1af7e4e09fd0271432340a5cadf3eb96005", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { "locked": { "lastModified": 1730652660, "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", @@ -169,11 +154,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1733466958, - "narHash": "sha256-JACQSAw27LYEdfDZuPVKbLpX5kTUkgpq53WTt2BZTW0=", + "lastModified": 1733639704, + "narHash": "sha256-BOnQcijJKaGzlO8JfdiwoJuLyN75oawzNtDXBJmApJw=", "owner": "nix-community", "repo": "fenix", - "rev": "c1bb57f954601094bfacc2a7ca65551b3f1bcecd", + "rev": "623d27686a7c03e28e6c6dcfaedad367fe55145c", "type": "github" }, "original": { @@ -432,11 +417,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733496398, - "narHash": "sha256-zPxsEI6P/RfEbv2STItY3LbXQMdFJQoY5khOIv3oYJM=", + "lastModified": 1733656469, + "narHash": "sha256-Eycc+MhSCoFsy0KagOQt5F1fK9vF2hyn4TneZRc3FLE=", "owner": "helix-editor", "repo": "helix", - "rev": "fc9968bd4bbc5adbcc35bb2fa40515dbb96a3a36", + "rev": "db1d84256fbae21abb3ba46943fb1abb8e211355", "type": "github" }, "original": { @@ -581,11 +566,11 @@ ] }, "locked": { - "lastModified": 1732808127, - "narHash": "sha256-jwqYmLVfvoLPu8UScEzZgdbbiNU3ioYcrsthjEEnGqI=", + "lastModified": 1733248371, + "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "4d927a52be7e15e0846456f2aa1b0ad76b5bf059", + "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13", "type": "github" }, "original": { @@ -672,11 +657,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1733496302, - "narHash": "sha256-DSSydpXuUIf5dEYVpQg6IVjXbPcOUR1JWP/fycU9Fys=", + "lastModified": 1733683959, + "narHash": "sha256-+tHGw4fimhZ9LtGUTpXV8V1EH5AWY6FC/3u5OmZ4I5A=", "owner": "hyprwm", "repo": "hyprland", - "rev": "b1e5cc66bdb20b002c93479490c3a317552210b3", + "rev": "0a27af8cd190315c1f13363ebd11e83d30455d48", "type": "github" }, "original": { @@ -810,11 +795,11 @@ ] }, "locked": { - "lastModified": 1733073235, - "narHash": "sha256-zbaWpcnwK9XG2lzWPNY2tAtEoTAO4HVk1tMM6AsJq8I=", + "lastModified": 1733672536, + "narHash": "sha256-bCtJwEmKG114e0y5GDj5fZ24KkgVVunbN9xgCjQa1OQ=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "cc7ffe73e7588137eb239239da0d83fe334b3ddd", + "rev": "8010b81e7b4100a1f2ef937be5268a13c27987e9", "type": "github" }, "original": { @@ -962,29 +947,6 @@ "type": "github" } }, - "ironbar": { - "inputs": { - "crane": "crane_2", - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1733400262, - "narHash": "sha256-DitvaV9O4sXIsvT7+7bJaeD2NittAAAM2q0U3NvSA04=", - "owner": "JakeStanger", - "repo": "ironbar", - "rev": "9f7c3918c4a0388b0d957718a7b1be011d99cdea", - "type": "github" - }, - "original": { - "owner": "JakeStanger", - "repo": "ironbar", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -1009,12 +971,12 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1731941836, @@ -1032,7 +994,7 @@ }, "microfetch": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1730220355, @@ -1064,24 +1026,6 @@ } }, "naersk": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", - "owner": "nix-community", - "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "naersk_2": { "inputs": { "nixpkgs": [ "nvf", @@ -1113,7 +1057,7 @@ "nvf", "nixpkgs" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1732053863, @@ -1140,11 +1084,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1733101372, - "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", + "lastModified": 1733670029, + "narHash": "sha256-CxorsZ6WyGpWRFmWJlnFRBEV54Rof9VQbTXoOj/hcPI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", + "rev": "b395d1c43776b252427ff0cb879c257ac5ee52d8", "type": "github" }, "original": { @@ -1237,22 +1181,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1733024928, - "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -1333,20 +1261,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1732937961, - "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1730642263, "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", @@ -1362,7 +1276,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1722719969, "narHash": "sha256-E47qbT/mRtBCSZra+9S9208sp/QnNeOAq7EhHX+eMNE=", @@ -1377,13 +1291,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -1393,6 +1307,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1733024928, + "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -1415,7 +1345,7 @@ "flake-utils": "flake-utils_2", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nmd": "nmd", "plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-base16": "plugin-base16", @@ -3461,8 +3391,8 @@ }, "rnix-lsp": { "inputs": { - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_11", + "naersk": "naersk", + "nixpkgs": "nixpkgs_10", "utils": "utils" }, "locked": { @@ -3495,11 +3425,10 @@ "hyprlock": "hyprlock", "hyprpaper": "hyprpaper", "hyprsysteminfo": "hyprsysteminfo", - "ironbar": "ironbar", "lanzaboote": "lanzaboote", "microfetch": "microfetch", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nvf": "nvf", "systems": "systems_7", "tuirun": "tuirun", @@ -3509,11 +3438,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1733427694, - "narHash": "sha256-r8Ab+UJUM2H0inWuFL3QFVnBRkuwsr79L6RnTVDTCCY=", + "lastModified": 1733574460, + "narHash": "sha256-YSKgunlXLHq/ylgm1H38Cy19q6g7m+SGBXQCbEz7nvc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "150b0e72929453f800db1a14e81003295ea5822d", + "rev": "4a418837f2e35ec7ab9620f339bab9719db4db40", "type": "github" }, "original": { @@ -3545,27 +3474,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -3586,7 +3494,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "nvf", @@ -3759,11 +3667,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1733037609, - "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", + "lastModified": 1733681789, + "narHash": "sha256-cwTTwiYkUdFpJFpFlnalteT0bn7s7bC3ngj2tdKWhZk=", "ref": "refs/heads/main", - "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", - "revCount": 863, + "rev": "b0c0d44e0e533b42790360d30430a69b330849d6", + "revCount": 867, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" diff --git a/flake.nix b/flake.nix index b6c86e26..40edc3c8 100644 --- a/flake.nix +++ b/flake.nix @@ -97,11 +97,6 @@ }; }; - ironbar = { - url = "github:JakeStanger/ironbar"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - anyrun.url = "github:anyrun-org/anyrun"; microfetch.url = "github:NotAShelf/microfetch"; agenix.url = "github:ryantm/agenix"; diff --git a/modules/default.nix b/modules/default.nix index 36b0e5f5..73a785a9 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,7 +13,6 @@ ./home/programs/helix ./home/programs/hyprland ./home/programs/hyprlock - ./home/programs/ironbar ./home/programs/jujutsu ./home/programs/kitty ./home/programs/misc @@ -24,11 +23,12 @@ ./home/programs/rofi ./home/programs/ssh ./home/programs/tuirun - ./home/programs/vscodium + ./home/programs/vscode ./home/programs/waybar ./home/programs/wezterm ./home/programs/yazi ./home/programs/zathura + ./home/programs/zed-editor ./home/programs/zellij ./home/programs/zen ./home/programs/zsh diff --git a/modules/home/programs/hyprland/keybinds.nix b/modules/home/programs/hyprland/keybinds.nix index e6725df7..6c7690b7 100644 --- a/modules/home/programs/hyprland/keybinds.nix +++ b/modules/home/programs/hyprland/keybinds.nix @@ -26,7 +26,7 @@ in { "$fileManager" = "thunar"; "$menu" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --"; "$menuw" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --"; - "$yazi" = "alacritty -e yazi"; + "$yazi" = "foot -e yazi"; "$tuirun" = "tuirun-toggle.sh"; bind = [ diff --git a/modules/home/programs/ironbar/colors.nix b/modules/home/programs/ironbar/colors.nix deleted file mode 100644 index de6384f4..00000000 --- a/modules/home/programs/ironbar/colors.nix +++ /dev/null @@ -1,43 +0,0 @@ -rec { - base = { - rosewater = "#f5e0dc"; - flamingo = "#f2cdcd"; - pink = "#f5c2e7"; - mauve = "#cba6f7"; - red = "#f38ba8"; - maroon = "#eba0ac"; - peach = "#fab387"; - yellow = "#f9e2af"; - green = "#a6e3a1"; - teal = "#94e2d5"; - sky = "#89dceb"; - sapphire = "#74c7ec"; - blue = "#89b4fa"; - lavender = "#b4befe"; - - text = "#cdd6f4"; - subtext1 = "#bac2de"; - subtext0 = "#a6adc8"; - overlay2 = "#9399b2"; - overlay1 = "#7f849c"; - overlay0 = "#6c7086"; - - surface2 = "#585b70"; - surface1 = "#45475a"; - surface0 = "#313244"; - - base = "#1e1e2e"; - mantle = "#181825"; - crust = "#11111b"; - - border = "#28283d"; - }; - extra = - { - fg = base.text; - bg = base.base; - bg1 = base.surface0; - shadow = base.crust; - } - // base; -} diff --git a/modules/home/programs/ironbar/default.nix b/modules/home/programs/ironbar/default.nix deleted file mode 100644 index c438ed59..00000000 --- a/modules/home/programs/ironbar/default.nix +++ /dev/null @@ -1,294 +0,0 @@ -{ - config, - lib, - inputs, - pkgs, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.programs.ironbar; -in { - options = { - home.programs.ironbar.enable = mkEnableOption "Enables ironbar"; - }; - imports = [ - inputs.ironbar.homeManagerModules.default - ]; - config = mkIf cfg.enable { - programs.ironbar = { - enable = true; - # config = let - # workspaces = { - # type = "workspaces"; - # all_monitors = false; - # favorites = map (n: builtins.toString n) [1 2 3 4 5 6 7 8 9 10]; - # hidden = ["special"]; - # name_map = let - # workspaces = lib.genAttrs (map (n: builtins.toString n) [1 2 3 4 5 6 7 8 9 10]); - # mkColorfull = text: color: "${text}"; # "${text}"; - # dotify = _: mkColorfull "●"; - # c = builtins.mapAttrs dotify (import ./colors.nix).base; - # in - # workspaces ( - # i: - # if i == "1" - # then c.red - # else if i == "2" - # then c.maroon - # else if i == "3" - # then c.peach - # else if i == "4" - # then c.yellow - # else if i == "5" - # then c.green - # else if i == "6" - # then c.teal - # else if i == "7" - # then c.sky - # else if i == "8" - # then c.sapphire - # else if i == "9" - # then c.blue - # else if i == "10" - # then c.lavender - # else c.mauve - # ); - # }; - - # music = let - # state_path = "${config.xdg.stateHome}/music-ctrls-state"; - # show-script = pkgs.writeShellApplication { - # name = "mctrls-shower"; - # runtimeInputs = with pkgs; [coreutils]; - # text = '' - # ${pkgs.coreutils}/bin/touch ${state_path} - # out=$(< ${state_path}) - # if [[ $out != "show" ]]; then - # echo -ne "show" > ${state_path} - # fi - # ''; - # }; - # hide-script = pkgs.writeShellApplication { - # name = "mctrls-hider"; - # runtimeInputs = with pkgs; [coreutils]; - # text = '' - # ${pkgs.coreutils}/bin/touch ${state_path} - # out=$(< ${state_path}) - # if [[ $out == "show" ]]; then - # echo -ne "" >${state_path} - # fi - # ''; - # }; - # in { - # type = "music"; - # player_type = "mpris"; - # format = "{title}"; - # truncate = "end"; - # #icons.play = "icon:media-playback-start"; - # #icons.pause = "icon:media-playback-pause"; - # music_dir = config.xdg.userDirs.music; - # show_status_icon = false; - # on_mouse_enter.cmd = "${show-script}/bin/mctrls-shower"; - # on_mouse_exit.cmd = "${hide-script}/bin/mctrls-hider"; - # #icon_size = 64; - # #cover_image_size = 256; - # }; - # music_img = rec { - # type = "custom"; - # name = "music-img"; - # class = name; - # on_mouse_enter = music.on_mouse_enter; - # on_mouse_exit = music.on_mouse_exit; - # bar = [ - # { - # type = "image"; - # class = name + "-img"; - # #src = ''{{poll:5000:${pkgs.playerctl}/bin/playerctl metadata mpris:artUrl}}''; - # src = ''{{watch:${pkgs.playerctl}/bin/playerctl -F metadata mpris:artUrl}}''; - # } - # ]; - # }; - # music_inline_controls = let - # check-script = pkgs.writeShellApplication { - # name = "mctrls-checker"; - # runtimeInputs = with pkgs; [coreutils]; - # text = let - # state_path = "${config.xdg.stateHome}/music-ctrls-state"; - # in '' - # ${pkgs.coreutils}/bin/touch ${state_path} - # if [[ $(< ${state_path}) == "show" ]]; then - # exit 0 - # else - # exit 1 - # fi - # ''; - # }; - # play-icon-script = pkgs.writeShellApplication { - # name = "pp-icon"; - # runtimeInputs = [pkgs.playerctl]; - # text = '' - # if [[ $(${pkgs.playerctl}/bin/playerctl status) == "Playing" ]]; then - # echo "" - # else - # echo "" - # fi - # ''; - # }; - # in rec { - # type = "custom"; - # name = "music-ctrls"; - # class = name; - # show_if = { - # mode = "poll"; - # interval = 1000; - # cmd = "${check-script}/bin/mctrls-checker"; - # }; - # on_mouse_enter = music.on_mouse_enter; - # on_mouse_exit = music.on_mouse_exit; - # transition_type = "slide_start"; - # bar = let - # pctl = cmd: - # "!" - # + (pkgs.writeShellApplication { - # name = "iron-${cmd}"; - # runtimeInputs = [pkgs.playerctl]; - # text = "${pkgs.playerctl}/bin/playerctl ${cmd}"; - # }) - # + "/bin/iron-${cmd}"; - # in [ - # { - # type = "button"; - # class = name + "-prev"; - # label = "󰒮"; - # on_click = pctl "previous"; - # } - # { - # type = "button"; - # class = name + "-pp"; - # label = "{{poll:100:${play-icon-script}/bin/pp-icon}}"; - # on_click = pctl "play-pause"; - # } - # { - # type = "button"; - # class = name + "-next"; - # label = "󰒭"; - # on_click = pctl "next"; - # } - # ]; - # }; - # sys_info = { - # type = "sys_info"; - # format = [" {cpu_percent}%" " {memory_percent}%"]; - # }; - # battery = { - # type = "upower"; - # format = "{percentage}%"; - # }; - - # tray = {type = "tray";}; - # clock = { - # type = "clock"; - # format = "%l:%M %P"; - # }; - - # cava = { - # type = "script"; - # mode = "watch"; - # cmd = - # (pkgs.writeShellApplication { - # name = "cava"; - # runtimeInputs = [pkgs.cava pkgs.gnused]; - # text = '' - # printf "[general]\nframerate=160\nbars = 7\n[output]\nmethod = raw\nraw_target = /dev/stdout\ndata_format = ascii\nascii_max_range = 7\n" | cava -p /dev/stdin | sed -u 's/;//g;s/0/▁/g;s/1/▂/g;s/2/▃/g;s/3/▄/g;s/4/▅/g;s/5/▆/g;s/6/▇/g;s/7/█/g; ' - # ''; - # }) - # + "/bin/cava"; - # }; - # dash = rec { - # type = "custom"; - # name = "nix-launcher"; - # class = name; - # bar = [ - # { - # type = "button"; - # label = "󰇙 "; - # on_click = "popup:toggle"; - # } - # ]; - # popup = [ - # { - # type = "box"; - # orientation = "v"; - # widgets = [ - # #{ - # # type = "label"; - # # label = "{{${pkgs.macchina}/bin/macchina}}"; - # #} - # { - # type = "box"; - # widgets = [ - # { - # type = "button"; - # label = "󱗼 Applications"; - # on_click = "!tuirun-toggle"; - # } - # { - # type = "button"; - # label = "󰕾 Sound"; - # on_click = "!${pkgs.pavucontrol}/bin/pavucontrol"; - # } - # { - # type = "button"; - # label = "󰐥 Power"; - # on_click = "!${pkgs.nwg-bar}/bin/nwg-bar"; - # } - # ]; - # } - # ]; - # } - # ]; - # }; - - # left = [ - # #focused - # dash - # workspaces - # ]; - # right = [ - # tray - # sys_info - # cava - # battery - # clock - # ]; - # center = [ - # music_img - # music - # music_inline_controls - # ]; - # in { - # anchor_to_edges = true; - # position = "top"; - # start = left; - # end = right; - # center = center; - # #center = [ - # # { - # # type = "label"; - # # label = "random num: {{500:playerctl metadata mpris:artUrl}}"; - # # } - # #]; - # height = 32; - # icon_theme = config.gtk.iconTheme.name; - # }; - # style = let - # built = pkgs.callPackage ./scss-pkg.nix { - # src = ./styles; - # entry = "main"; - # }; - # in '' - # @import url("${built}/out.css"); - # ''; - }; - }; -} diff --git a/modules/home/programs/ironbar/scss-pkg.nix b/modules/home/programs/ironbar/scss-pkg.nix deleted file mode 100644 index 16c5bc59..00000000 --- a/modules/home/programs/ironbar/scss-pkg.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - dart-sass, - stdenvNoCC, - src ? ./styles, - entry ? "main", -}: -stdenvNoCC.mkDerivation { - pname = "built-scss"; - version = "1.0"; - inherit src; - nativeBuildInputs = [dart-sass]; - buildPhase = '' - dart-sass ${entry}.scss > __nix_out__.css.out - ''; - installPhase = '' - mkdir -p $out/ - cp __nix_out__.css.out $out/out.css - ''; -} diff --git a/modules/home/programs/ironbar/styles/_colors.scss b/modules/home/programs/ironbar/styles/_colors.scss deleted file mode 100644 index 1dede78b..00000000 --- a/modules/home/programs/ironbar/styles/_colors.scss +++ /dev/null @@ -1,35 +0,0 @@ -$rosewater: #f5e0dc; -$flamingo: #f2cdcd; -$pink: #f5c2e7; -$mauve: #cba6f7; -$red: #f38ba8; -$maroon: #eba0ac; -$peach: #fab387; -$yellow: #f9e2af; -$green: #a6e3a1; -$teal: #94e2d5; -$sky: #89dceb; -$sapphire: #74c7ec; -$blue: #89b4fa; -$lavender: #b4befe; - -$text: #cdd6f4; -$subtext1: #bac2de; -$subtext0: #a6adc8; -$overlay2: #9399b2; -$overlay1: #7f849c; -$overlay0: #6c7086; - -$surface2: #585b70; -$surface1: #45475a; -$surface0: #313244; - -$base: #1e1e2e; -$mantle: #181825; -$crust: #11111b; - -$fg: $text; -$bg: $base; -$bg1: $surface0; -$border: #28283d; -$shadow: $crust; diff --git a/modules/home/programs/ironbar/styles/main.scss b/modules/home/programs/ironbar/styles/main.scss deleted file mode 100644 index edb4e9b5..00000000 --- a/modules/home/programs/ironbar/styles/main.scss +++ /dev/null @@ -1,221 +0,0 @@ -@use "colors" as *; - -* { - font-family: - Product Sans, - Roboto, - sans-serif, - monospace; - font-size: 13px; - transition: 200ms ease; - - color: $fg; - /*background-color: #2d2d2d;*/ - /*background-color: $bg;*/ - border: none; - - /*opacity: 0.4;*/ -} - -#bar { - background-color: $bg; -} - -.container { - background-color: $bg; -} - -#right > * + * { - margin-left: 20px; -} - -#left > * + * { - margin-right: 20px; -} -.nix-launcher button { - all: unset; - background-color: $bg; -} -.popup-nix-launcher label { - font-family: monospace; -} - -.nix-launcher label { - background-color: transparent; - color: $bg; - font-family: monospace; - font-size: 1.5rem; - padding: 0 1.1rem 0 0.5rem; -} - -.workspaces { - all: unset; - margin-left: 10px; -} -.workspaces label { - font-family: Material Symbols Outlined; - font-size: 0.9rem; -} -.workspaces .item { - all: unset; - color: $pink; - margin-right: 5px; - padding: 0px; - font-family: Material Symbols Outlined; - border-radius: 20px; -} - -.workspaces .item.focused { - color: $red; -} -.workspaces .item.focused label { - font-size: 1.2rem; -} -.workspaces .item.inactive { - color: $maroon; -} -.workspaces .item.inactive label { - font-size: 0.5rem; -} - -.clock { - color: $fg; - background-color: $bg; - font-weight: bold; -} - -.sysinfo { - color: $fg; -} - -.tray { - background-color: $bg; -} - -.tray .item { - background-color: $bg; - -gtk-icon-effect: dim; -} - -.upower, -.upower * { - all: unset; - background-color: $bg; - color: $fg; -} -.music-img { - border-radius: 8px; - margin-right: 8px; -} -.music-ctrls * { - all: unset; - margin-left: 10px; -} - -.music { - background-color: $bg; - color: $fg; -} -.music label { - font-size: 16px; -} - -.popup { - background-color: $bg; - border: 1px solid $subtext0; -} - -.popup-clock { - padding: 1em; -} - -.calendar-clock { - color: $fg; - font-size: 2.5em; - padding-bottom: 0.1em; -} - -.calendar { - background-color: $bg; - color: $fg; -} - -.calendar .header { - padding-top: 1em; - border-top: 1px solid $subtext0; - font-size: 1.5em; -} - -.calendar:selected { - background-color: $blue; -} - -.power-menu { - margin-left: 10px; -} - -.power-menu .power-btn { - color: $fg; - background-color: $bg; -} - -.power-menu .power-btn:hover { - background-color: $mantle; -} - -.popup-power-menu { - padding: 1em; -} - -.popup-power-menu #header { - color: $fg; - font-size: 1.4em; - border-bottom: 1px solid $overlay1; - padding-bottom: 0.4em; - margin-bottom: 0.8em; -} - -.popup-power-menu .power-btn { - color: $fg; - background-color: $bg; - border: 1px solid $overlay1; - padding: 0.6em 1em; -} - -.popup-power-menu .power-btn + .power-btn { - margin-left: 1em; -} - -.popup-power-menu .power-btn:hover { - background-color: $mantle; -} - -.music { - all: unset; - color: $fg; - font-size: 16px; -} - -.popup-music .album-art { - margin-right: 1em; - border-radius: 20px; -} - -.popup-music .title .icon-box, -.popup-mpd .title .icon-icon { - font-size: 1.7em; -} - -.popup-music .controls * { - border-radius: 0; - background-color: transparent; - color: $fg; -} - -.popup-music .controls *:disabled { - color: $overlay1; -} - -.focused { - color: $fg; -} diff --git a/modules/home/programs/misc/default.nix b/modules/home/programs/misc/default.nix index 03566d12..3cb2d19e 100644 --- a/modules/home/programs/misc/default.nix +++ b/modules/home/programs/misc/default.nix @@ -40,7 +40,6 @@ in { usbimager # write bootable usb images! slurp # select region for screenshot # misc.tui - ranger xcur2png cmatrix calcurse # calendar diff --git a/modules/home/programs/vscode/default.nix b/modules/home/programs/vscode/default.nix new file mode 100644 index 00000000..b161890a --- /dev/null +++ b/modules/home/programs/vscode/default.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + pkgs, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.home.programs.vscode; +in { + options = { + home.programs.vscode.enable = mkEnableOption "Enables vscode"; + }; + config = mkIf cfg.enable { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + sainnhe.gruvbox-material + vscodevim.vim + rust-lang.rust-analyzer + kamadorueda.alejandra + arrterian.nix-env-selector + ]; + }; + }; +} diff --git a/modules/home/programs/vscodium/default.nix b/modules/home/programs/vscodium/default.nix deleted file mode 100644 index b24608b2..00000000 --- a/modules/home/programs/vscodium/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.programs.vscodium; -in { - options = { - home.programs.vscodium.enable = mkEnableOption "Enables vscodium"; - }; - config = mkIf cfg.enable { - home.packages = with pkgs; [ - vscodium-fhs - ]; - }; -} diff --git a/modules/home/programs/zed-editor/default.nix b/modules/home/programs/zed-editor/default.nix new file mode 100644 index 00000000..636e3081 --- /dev/null +++ b/modules/home/programs/zed-editor/default.nix @@ -0,0 +1,17 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.home.programs.zed-editor; +in { + options = { + home.programs.zed-editor.enable = mkEnableOption "Enables zed-editor"; + }; + config = mkIf cfg.enable { + programs.zed-editor = { + enable = true; + }; + }; +} diff --git a/modules/nixos/system/devpkgs/default.nix b/modules/nixos/system/devpkgs/default.nix index 1cbfa5ea..9ea37374 100644 --- a/modules/nixos/system/devpkgs/default.nix +++ b/modules/nixos/system/devpkgs/default.nix @@ -2,6 +2,7 @@ pkgs, lib, config, + inputs, ... }: let inherit (lib) mkIf mkOption types; @@ -24,13 +25,12 @@ in { rust-analyzer lua-language-server nixd + nil php # php84Packages.php-cs-fixer # phpactor python312Packages.python-lsp-server bash-language-server - nil - nodePackages.vscode-langservers-extracted clang-tools marksman pyright diff --git a/nix/shell/default.nix b/nix/shell/default.nix index 7aeb9b0f..b04801c1 100644 --- a/nix/shell/default.nix +++ b/nix/shell/default.nix @@ -21,7 +21,7 @@ gnumake # GNU Make pkg-config # Manages library paths during compilation perl # Scripting language, sometimes needed during builds - gtk-layer-shell + gtk4-layer-shell # Version control git # Version control system @@ -40,6 +40,7 @@ wayland # Wayland client library wayland-protocols # Wayland protocols for Wayland applications gtk3 + gtk4 # Cryptography openssl # TLS/SSL library for networking and encryption diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix index 2fef7734..9b949015 100644 --- a/users/cnst/modules.nix +++ b/users/cnst/modules.nix @@ -53,9 +53,6 @@ hyprlock = { enable = true; }; - ironbar = { - enable = false; - }; jujutsu = { enable = false; }; @@ -86,7 +83,7 @@ tuirun = { enable = true; }; - vscodium = { + vscode = { enable = true; }; waybar = { @@ -96,11 +93,14 @@ enable = false; }; yazi = { - enable = false; + enable = true; }; zathura = { enable = true; }; + zed-editor = { + enable = true; + }; zellij = { enable = false; }; diff --git a/users/default.nix b/users/default.nix index 83e3e571..0611c005 100644 --- a/users/default.nix +++ b/users/default.nix @@ -8,6 +8,7 @@ sharedImports = [ # ./etc "${self}/scripts" + inputs.nvf.homeManagerModules.default self.nixosModules.home self.nixosModules.options ]; @@ -16,7 +17,6 @@ "cnst@cnix" = sharedImports ++ [ - inputs.nvf.homeManagerModules.default ./cnst ]; "cnst@cnixpad" = diff --git a/users/toothpick/modules.nix b/users/toothpick/modules.nix index f229598e..395fad56 100644 --- a/users/toothpick/modules.nix +++ b/users/toothpick/modules.nix @@ -57,6 +57,9 @@ enable = true; }; neovim = { + enable = false; + }; + nvf = { enable = true; }; nwg-bar = {