diff --git a/flake.lock b/flake.lock index 03c827e..ee2e50e 100644 --- a/flake.lock +++ b/flake.lock @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1738753876, - "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", + "lastModified": 1739298825, + "narHash": "sha256-q9CzTY7n8n9RK9mKUQ4VbaKdydhXQqzphahEG5Wt8sI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", + "rev": "f0a31d38e6de48970ce1fe93e6ea343e20a9c80a", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738756893, - "narHash": "sha256-8i0bwUAomkug0nTNkyzpVctC78FYCUWUg3kOtXVeR/c=", + "lastModified": 1739296148, + "narHash": "sha256-q00GM94Rr4Sgh/phpJucXonWkL9C9zX/8pFXstZKJcY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1b2c644b287066aa161734a727f3f6f5da9b4d5c", + "rev": "dc9e2366279f9c4f8586963e0aab3c0a4ebd9133", "type": "github" }, "original": { @@ -359,11 +359,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738751713, - "narHash": "sha256-DxucZaCzH72v4SSUC6eK1TNLQVxBwXr1nYMsABoJ6ls=", + "lastModified": 1739287457, + "narHash": "sha256-0xpNX8oVKJSKglhfrxQxMhA5UWOu2OAUwNvxNuDmOI8=", "owner": "YaLTeR", "repo": "niri", - "rev": "900da597e4d3d09ad4c4ddc3ba2abf58c4886ec9", + "rev": "213eafa2032897e7ce3132f179a135a65d327d9b", "type": "github" }, "original": { @@ -381,11 +381,11 @@ ] }, "locked": { - "lastModified": 1738720055, - "narHash": "sha256-EM3qXpBkIP5Pt4NgmaKlI+QHPZRfLbYl/Lym4muHWUY=", + "lastModified": 1739238493, + "narHash": "sha256-rk89UVGqLwts2c05TMpigB+zL2mhIYn33YUC69v7dxk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c30f3cd8a3256cb7916af31aa3625759ebb05ace", + "rev": "eca81883cfad1f52a52d09025d10f5907200ea06", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -412,11 +412,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738702386, - "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "lastModified": 1739206421, + "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "rev": "44534bc021b85c8d78e465021e21f33b856e2540", "type": "github" }, "original": { @@ -461,11 +461,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1738611626, - "narHash": "sha256-IgjqlYPaS8Bg+jc6a691w27XDFhBeM7gkP4eDcR2EBs=", + "lastModified": 1739215427, + "narHash": "sha256-1yIsiPwwxXal7+wkWogjPhsM5BjRlK61lAHQtlX8s04=", "owner": "danth", "repo": "stylix", - "rev": "d513f59da5856978c363d2f82103f708f4a6024d", + "rev": "4af2686c1c62176d0ce28c4d55e813ae5ed52b6f", "type": "github" }, "original": { @@ -577,11 +577,11 @@ ] }, "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { @@ -610,11 +610,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1737837494, - "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { diff --git a/hosts/main-laptop/configuration.nix b/hosts/main-laptop/configuration.nix index cc57fc2..df265f2 100644 --- a/hosts/main-laptop/configuration.nix +++ b/hosts/main-laptop/configuration.nix @@ -19,7 +19,6 @@ systemd.services.NetworkManager-wait-online.enable = false; - virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = [ "fedfer" ]; stylix.enable = true; diff --git a/hosts/main-laptop/home.nix b/hosts/main-laptop/home.nix index c2635e6..15a7869 100644 --- a/hosts/main-laptop/home.nix +++ b/hosts/main-laptop/home.nix @@ -1,6 +1,5 @@ { lib, - inputs, pkgs, ... }: @@ -17,9 +16,9 @@ programs = { firefox.enable = lib.mkForce true; amberol.enable = lib.mkForce true; - wezterm.enable = lib.mkForce true; vscodium.enable = lib.mkForce true; kitty.enable = lib.mkForce true; + ghostty.enable = true; starship.enable = lib.mkForce true; helix.enable = lib.mkForce true; @@ -32,19 +31,6 @@ services.mpris-proxy.enable = true; - programs.gnome-shell = { - enable = true; - extensions = [ - { package = pkgs.gnomeExtensions.valent; } - { package = pkgs.gnomeExtensions.blur-my-shell; } - { package = pkgs.gnomeExtensions.dash-to-dock; } - { package = pkgs.gnomeExtensions.tray-icons-reloaded; } - { package = pkgs.gnomeExtensions.native-window-placement; } - { package = pkgs.gnomeExtensions.system-monitor; } - { package = pkgs.gnomeExtensions.highlight-focus; } - ]; - }; - stylix = { enable = true; autoEnable = true; @@ -79,8 +65,6 @@ home.packages = with pkgs; [ prismlauncher foliate - biome - python3 impression chatterino2 qbittorrent @@ -88,7 +72,6 @@ nixpkgs-fmt nixfmt-rfc-style powertop - git-credential-manager vesktop libreoffice valent @@ -100,8 +83,11 @@ celluloid fractal yazi - # logseq requires electron 27 which is EOL therefore temp disable until upstream pkg updates - #logseq + nautilus + tuba + eza + bat + gitui ]; home.stateVersion = "23.11"; # DO NOT CHANGE diff --git a/modules/home/cliPrograms/bat.nix b/modules/home/cliPrograms/bat.nix new file mode 100644 index 0000000..6f80383 --- /dev/null +++ b/modules/home/cliPrograms/bat.nix @@ -0,0 +1,14 @@ +{ config, lib, ... }: +{ + options.setting.programs.bat = { + enable = lib.mkEnableOption "enable bat, cat replacement"; + }; + + config = lib.mkIf config.settings.programs.bat { + programs.bat.enable = true; + + programs.fish.shellAliases = lib.mkIf config.settings.shell.fish.enable { + "cat" = "bat"; + }; + }; +} diff --git a/modules/home/default.nix b/modules/home/default.nix index efdc58e..88b9030 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -10,6 +10,7 @@ ./cliPrograms/pass.nix ./cliPrograms/hyfetch.nix ./cliPrograms/git.nix + ./cliPrograms/bat.nix ./cliPrograms/starship ./cliPrograms/fastfetch @@ -23,6 +24,7 @@ ./desktopPrograms/wezterm ./desktopPrograms/vscodium ./desktopPrograms/kitty + ./desktopPrograms/ghostty ]; settings = { @@ -40,10 +42,12 @@ vscodium.enable = lib.mkDefault false; zed.enable = lib.mkDefault false; kitty.enable = lib.mkDefault false; + ghostty.enable = lib.mkDefault false; pass.enable = lib.mkDefault true; fastfetch.enable = lib.mkDefault true; git.enable = lib.mkDefault true; + bat.enable = lib.mkDefault true; hyfetch.enable = lib.mkDefault false; starship.enable = lib.mkDefault false; helix.enable = lib.mkDefault false; diff --git a/modules/home/desktopPrograms/ghostty/default.nix b/modules/home/desktopPrograms/ghostty/default.nix new file mode 100644 index 0000000..8f696ef --- /dev/null +++ b/modules/home/desktopPrograms/ghostty/default.nix @@ -0,0 +1,14 @@ +{ config, lib, ... }: +{ + options.settings.programs.ghostty = { + enable = lib.mkEnableOption "enable ghostty terminal emulator"; + }; + + config = lib.mkIf config.settings.programs.ghostty.enable { + programs.ghostty = { + enable = true; + enableFishIntegration = true; + installBatSyntax = true; + }; + }; +} diff --git a/modules/home/desktopPrograms/vscodium/default.nix b/modules/home/desktopPrograms/vscodium/default.nix index 9cd15b9..83e2071 100644 --- a/modules/home/desktopPrograms/vscodium/default.nix +++ b/modules/home/desktopPrograms/vscodium/default.nix @@ -36,7 +36,6 @@ ]) (with pkgs.open-vsx; [ jeanp413.open-remote-ssh - antfu.unocss bierner.markdown-preview-github-styles sumneko.lua ]) diff --git a/modules/home/desktopPrograms/vscodium/settings.json b/modules/home/desktopPrograms/vscodium/settings.json index 9409ebd..8cb5ae4 100644 --- a/modules/home/desktopPrograms/vscodium/settings.json +++ b/modules/home/desktopPrograms/vscodium/settings.json @@ -5,21 +5,23 @@ "workbench.productIconTheme": "material-product-icons", "editor.fontLigatures": true, "terminal.integrated.fontLigatures": true, - "workbench.sideBar.location": "right", "workbench.startupEditor": "welcomePageInEmptyWorkbench", "editor.formatOnSave": true, "C_Cpp.clang_format_fallbackStyle": "LLVM", "nix.enableLanguageServer": true, "nix.serverPath": "nixd", + "nix.formatterPath": [ + "nix", + "fmt", + "--", + "--" + ], "nix.serverSettings": { "nixd": { - "formatting": { - "command": ["nixfmt"] - }, "options": { "home-manager": { - "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").homeConfigurations.fedfer.options" + "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options.home-manager.users.type.getSubOptions []" }, "nixos": { "expr": "(builtins.getFlake \"/home/fedfer/Documents/sys-config\").nixosConfigurations.fedfer-main-laptop-nixos.options" @@ -27,4 +29,4 @@ } } } -} +} \ No newline at end of file diff --git a/modules/home/niri/config.kdl b/modules/home/niri/config.kdl index fa0920f..4823fe8 100644 --- a/modules/home/niri/config.kdl +++ b/modules/home/niri/config.kdl @@ -148,6 +148,10 @@ window-rule { clip-to-geometry true } +hotkey-overlay { + skip-at-startup +} + binds { Mod+Shift+Backslash { show-hotkey-overlay; } diff --git a/modules/home/niri/waybar.json b/modules/home/niri/waybar.json index b933db1..0d9b372 100644 --- a/modules/home/niri/waybar.json +++ b/modules/home/niri/waybar.json @@ -2,9 +2,22 @@ "layer": "top", "position": "top", "spacing": 10, - "modules-left": ["niri/workspaces"], - "modules-center": ["clock#1", "clock#2", "clock#3"], - "modules-right": ["pulseaudio", "memory", "cpu", "battery", "disk", "tray"], + "modules-left": [ + "niri/workspaces" + ], + "modules-center": [ + "clock#1", + "clock#2", + "clock#3" + ], + "modules-right": [ + "pulseaudio", + "memory", + "cpu", + "battery", + "disk", + "tray" + ], "sway/workspaces": { "disable-scroll": true, "format": "{name}" @@ -27,7 +40,10 @@ "format-muted": "", "format-icons": { "headphones": "", - "default": ["", ""] + "default": [ + "", + "" + ] }, "scroll-step": 5, "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", @@ -44,12 +60,18 @@ }, "battery": { "states": { - "good": 95, + "good": 50, "warning": 30, "critical": 15 }, "format": "{icon} {capacity}%", - "format-icons": ["", "", "", "", ""] + "format-icons": [ + "", + "", + "", + "", + "" + ] }, "disk": { "interval": 5, @@ -60,4 +82,4 @@ "icon-size": 22, "spacing": 6 } -} +} \ No newline at end of file diff --git a/modules/nixos/programs/niri.nix b/modules/nixos/programs/niri.nix index ca83f79..f1521fa 100644 --- a/modules/nixos/programs/niri.nix +++ b/modules/nixos/programs/niri.nix @@ -16,6 +16,8 @@ security.pam.services.swaylock = { }; + gtk.iconCache.enable = true; + environment.systemPackages = with pkgs; [ swayosd fuzzel diff --git a/modules/nixos/services/caddy.nix b/modules/nixos/services/caddy.nix index 98b3918..03dc030 100644 --- a/modules/nixos/services/caddy.nix +++ b/modules/nixos/services/caddy.nix @@ -11,7 +11,5 @@ config = lib.mkIf config.settings.services.caddy.enable { services.caddy.enable = true; - environment.systemPackages = [ pkgs.caddy ]; - #services.caddy.setting = { }; }; }