diff --git a/_old/kitty.nix b/_old/kitty.nix deleted file mode 100644 index 4af89e1..0000000 --- a/_old/kitty.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - programs.kitty = { - enable = true; - enableGitIntegration = true; - - themeFile = "Catppuccin-Frappe"; - settings = { - # font_family = "Berkeley Mono"; - font_family = "family='Berkeley Mono' postscript_name=BerkeleyMono-Regular"; - cursor_trail = 1; - - scrollbar = "hovered"; - scrollbar_width = 1.5; - scrollbar_hover_width = 1.5; - scrollbar_radius = 0.5; - - mouse_hide_wait = "1.0 0 0 no"; - - strip_trailing_spaces = "smart"; - - active_border_color = "blue"; - inactive_border_color = "white"; - bell_border_color = "red"; - - inactive_text_alpha = 0.6; - - tab_bar_style = "slant"; - - background_opacity = 0.9; - transparent_background_colors = "#3b3f53@0.9"; - }; - keybindings = { - "ctrl+up" = "neighboring_window up"; - "ctrl+right" = "neighboring_window right"; - "ctrl+down" = "neighboring_window down"; - "ctrl+left" = "neighboring_window left"; - "ctrl+shfit+p" = "nth_window -1"; - "ctrl+alt+t" = "detach_window new-tab"; - }; - }; -} diff --git a/flake.lock b/flake.lock index 0f0e6d3..3e85b71 100644 --- a/flake.lock +++ b/flake.lock @@ -191,24 +191,6 @@ "type": "github" } }, - "hyprcursor-phinger": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1763845612, - "narHash": "sha256-78zH5GrYa35bEkzeVnl8uXFbZ/zsiSHayjxZlNt+Xe8=", - "owner": "jappie3", - "repo": "hyprcursor-phinger", - "rev": "1207a845501a28e0e00d4a8e935ee0c9cab30650", - "type": "github" - }, - "original": { - "owner": "jappie3", - "repo": "hyprcursor-phinger", - "type": "github" - } - }, "hyprgraphics": { "inputs": { "hyprutils": [ @@ -249,7 +231,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -515,22 +497,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1780749050, "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", @@ -546,7 +512,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1782175435, "narHash": "sha256-8d2wCNWKnd86GzKZvbuqqlS+HqMrheXkvRf0qGJ/oA0=", @@ -559,7 +525,7 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1782175435, "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", @@ -578,7 +544,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "systems": "systems_2" }, "locked": { @@ -624,10 +590,9 @@ "flake-file": "flake-file", "flake-parts": "flake-parts", "home-manager": "home-manager", - "hyprcursor-phinger": "hyprcursor-phinger", "hyprland": "hyprland", "import-tree": "import-tree", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" } }, diff --git a/flake.nix b/flake.nix index 2407cd7..ecd14a1 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger"; hyprland.url = "github:hyprwm/Hyprland"; import-tree.url = "github:vic/import-tree"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; diff --git a/modules/hosts/flock/flock.nix b/modules/hosts/flock/flock.nix index a10f062..0130c7a 100644 --- a/modules/hosts/flock/flock.nix +++ b/modules/hosts/flock/flock.nix @@ -1,9 +1,11 @@ { den, ... }: { # host aspect den.aspects.flock = { - includes = [ + includes = with den.aspects; [ (den.batteries.hostname) (den.batteries.tty-autologin "igneous") + + hyprland ]; # host NixOS configuration diff --git a/modules/hyprland/_settings.nix b/modules/hyprland/_settings.nix index 0844993..8340003 100644 --- a/modules/hyprland/_settings.nix +++ b/modules/hyprland/_settings.nix @@ -8,9 +8,9 @@ ]; # keywords https://wiki.hypr.land/0.54.0/Configuring/Keywords/ - # "$terminal" = "kitty"; + "$terminal" = "kitty"; # "$browser " = "zen"; - # "$menu " = "hyprlauncher"; + "$menu " = "hyprlauncher"; "$mainMod" = "SUPER"; # autostart @@ -140,7 +140,7 @@ "$mainMod SHIFT, Q, killactive," "$mainMod, M, exit," "$mainMod, V, togglefloating," - # "$mainMod, SPACE, exec, $menu" + "$mainMod, SPACE, exec, $menu" # "$mainMod, F, exec, $browser" "$mainMod, TAB, focuscurrentorlast" diff --git a/modules/hyprland/hyprland.nix b/modules/hyprland/hyprland.nix index f393e61..caaf25a 100644 --- a/modules/hyprland/hyprland.nix +++ b/modules/hyprland/hyprland.nix @@ -1,7 +1,6 @@ { den, inputs, ... }: { flake-file.inputs = { - hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger"; hyprland.url = "github:hyprwm/Hyprland"; }; @@ -40,6 +39,14 @@ systemd.enable = true; configType = "hyprlang"; }; + + services.hyprlauncher = { + enable = true; + settings = { + finders.desktop_icons = true; + general.grab_focus = true; + }; + }; }; }; } diff --git a/modules/igneous.nix b/modules/igneous.nix index ac0fa38..200b180 100644 --- a/modules/igneous.nix +++ b/modules/igneous.nix @@ -8,6 +8,7 @@ bat hyprland + kitty nixvim shell shell.bash diff --git a/modules/kitty.nix b/modules/kitty.nix new file mode 100644 index 0000000..01a8954 --- /dev/null +++ b/modules/kitty.nix @@ -0,0 +1,44 @@ +{ + den.aspects.kitty = { + homeManager = { + programs.kitty = { + enable = true; + enableGitIntegration = true; + + themeFile = "Catppuccin-Frappe"; + settings = { + # font_family = "family='Berkeley Mono' postscript_name=BerkeleyMono-Regular"; + cursor_trail = 1; + + scrollbar = "hovered"; + scrollbar_width = 1.5; + scrollbar_hover_width = 1.5; + scrollbar_radius = 0.5; + + mouse_hide_wait = "1.0 0 0 no"; + + strip_trailing_spaces = "smart"; + + active_border_color = "blue"; + inactive_border_color = "white"; + bell_border_color = "red"; + + inactive_text_alpha = 0.6; + + tab_bar_style = "slant"; + + background_opacity = 0.9; + transparent_background_colors = "#3b3f53@0.9"; + }; + keybindings = { + "ctrl+up" = "neighboring_window up"; + "ctrl+right" = "neighboring_window right"; + "ctrl+down" = "neighboring_window down"; + "ctrl+left" = "neighboring_window left"; + "ctrl+shfit+p" = "nth_window -1"; + "ctrl+alt+t" = "detach_window new-tab"; + }; + }; + }; + }; +}