diff --git a/flake.lock b/flake.lock index b09137a..ba47222 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1717316182, + "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", "type": "github" }, "original": { @@ -20,145 +20,13 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1714837352, - "narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "cba1ade848feac44b2eda677503900639581c3f4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "ref": "v0.40.0", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1714755542, - "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -171,74 +39,8 @@ "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1714060055, - "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 18b0a3a..28bfa66 100644 --- a/flake.nix +++ b/flake.nix @@ -8,14 +8,9 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - - hyprland = { - url = "github:hyprwm/Hyprland/v0.40.0"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, home-manager, hyprland, nixpkgs, ... }@inputs: + outputs = { self, home-manager, nixpkgs, ... }@inputs: let system = "x86_64-linux"; in { nixosConfigurations."nixos" = @@ -24,9 +19,6 @@ modules = [ ./nixos.nix - hyprland.nixosModules.default - { programs.hyprland.enable = true; } - home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/home-manager.nix b/home-manager.nix index c8270c2..fdf3440 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -1,4 +1,4 @@ -{ config, pkgs, custom-neovim, ... }: +{ pkgs, ... }: { # @@ -14,6 +14,7 @@ ./programs/neovim ./programs/obs-studio.nix ./programs/rofi + ./programs/tmux ./programs/waybar.nix ./programs/wezterm ]; @@ -72,13 +73,11 @@ # Utilities brightnessctl discord - element-desktop fastfetch firefox pavucontrol - pulseaudio qbittorrent - tigervnc + qdirstat vesktop vlc yt-dlp @@ -95,10 +94,7 @@ spotify # Gaming - airshipper - dolphin-emu protontricks - r2modman wineWowPackages.stagingFull winetricks xonotic @@ -241,13 +237,10 @@ ## Theming home.pointerCursor = { package = pkgs.catppuccin-cursors.frappeLavender; - name = "Catppuccin-Frappe-Lavender-Cursors"; + name = "catppuccin-frappe-lavender-cursors"; gtk.enable = true; - x11 = { - enable = true; - defaultCursor = "Catppuccin-Frappe-Lavender-Cursors"; - }; + x11.enable = true; }; # Configure GTK. diff --git a/kernel/zenergy.nix b/kernel/zenergy.nix index 43865ee..cd89f03 100644 --- a/kernel/zenergy.nix +++ b/kernel/zenergy.nix @@ -8,8 +8,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "BoukeHaarsma23"; repo = "zenergy"; - rev = "a3e124477ee8197015481156b90100d49fa3cd84"; - hash = "sha256-s1aoipSsLKO23kTd2uGxVUpqYSeitiz3UIoDIxg/Dj8="; + rev = "d65592b3c9d171ba70e6017e0827191214d81937"; + hash = "sha256-10hiUHJvLTG3WGrr4WXMo/mCoJGFqWk2l5PryjNhcHg="; }; hardeningDisable = [ "format" "pic" ]; diff --git a/nixos.nix b/nixos.nix index 801808b..4cbb379 100644 --- a/nixos.nix +++ b/nixos.nix @@ -26,6 +26,7 @@ }; # Optimize storage + nix.optimise.automatic = true; nix.settings.auto-optimise-store = true; # This value determines the NixOS release from which the default @@ -41,12 +42,12 @@ ## # Kernel - boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.linuxPackages_latest; # TODO: FIX IT BEING BEING OVERWRITTEN boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback - (pkgs.callPackage ./kernel/zenergy.nix { kernel = pkgs.linux_zen; }) + (pkgs.callPackage ./kernel/zenergy.nix { kernel = pkgs.linux_latest; }) ]; # Bootloader. @@ -175,6 +176,9 @@ theme = "${import ./theming/sddm.nix { inherit pkgs; }}"; }; + # Enable Hyprland + programs.hyprland.enable = true; + # Enable OpenGL. hardware.opengl = { enable = true; diff --git a/programs/hyprland/default.nix b/programs/hyprland/default.nix index aff450c..ef2eef3 100644 --- a/programs/hyprland/default.nix +++ b/programs/hyprland/default.nix @@ -1,8 +1,4 @@ -{ hyprland, ... }: - { - imports = [ hyprland.homeManagerModules.default ]; - wayland.windowManager.hyprland = { enable = true; diff --git a/programs/neovim/lua/plugins/astrolsp.lua b/programs/neovim/lua/plugins/astrolsp.lua index c44e4fb..91a9954 100644 --- a/programs/neovim/lua/plugins/astrolsp.lua +++ b/programs/neovim/lua/plugins/astrolsp.lua @@ -29,6 +29,7 @@ return { "rust", "tsx", "typescript", + "svelte", }, ignore_filetypes = { -- disable format on save for specified filetypes -- "python", diff --git a/programs/tmux/default.nix b/programs/tmux/default.nix new file mode 100644 index 0000000..2ed07ac --- /dev/null +++ b/programs/tmux/default.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: + +{ + programs.tmux = { + enable = true; + clock24 = true; + plugins = with pkgs.tmuxPlugins; [ + { + plugin = catppuccin; + extraConfig = '' + set -g @catppuccin_flavour 'frappe' + ''; + } + ]; + }; +}