diff --git a/config/home.nix b/config/home.nix index 6d08c9d..e7d4f39 100644 --- a/config/home.nix +++ b/config/home.nix @@ -88,7 +88,7 @@ fzf ripgrep spotify-tui - spotify-player + fw-pkgs.spotify-player alsa-lib libdbusmenu xorg.libxcb diff --git a/flake.lock b/flake.lock index d1e3391..64fd67f 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,22 @@ "type": "github" } }, + "fw-pkgs": { + "locked": { + "lastModified": 1716477576, + "narHash": "sha256-eGruCZrvZXPH9Y8DuMFMyeErpu+GED+91K1wNtAz8B0=", + "owner": "FredzyW", + "repo": "fw-pkgs", + "rev": "d7daf63a4fc096a029d65f68a166b07a017a9b42", + "type": "github" + }, + "original": { + "owner": "FredzyW", + "ref": "master", + "repo": "fw-pkgs", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -158,6 +174,7 @@ }, "root": { "inputs": { + "fw-pkgs": "fw-pkgs", "home-manager": "home-manager", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 1c5e630..f9f842b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ # Nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + fw-pkgs.url = "github:FredzyW/fw-pkgs/master"; # Home manager home-manager.url = "github:nix-community/home-manager/release-23.11"; @@ -21,6 +22,7 @@ nixpkgs, home-manager, nixpkgs-unstable, + fw-pkgs, sops-nix, ... } @ inputs: let @@ -32,6 +34,12 @@ config.allowUnfree = true; }; }; + overlay-fw-pkgs = final: prev: { + fw-pkgs = import fw-pkgs { + inherit system; + config.allowUnfree = true; + }; + }; in { # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' @@ -85,7 +93,11 @@ inherit inputs outputs; myhostname = "laptop"; }; - modules = [./config/home.nix]; + modules = [ + ./config/home.nix + ({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; }) + ]; }; "fw@desktop" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; diff --git a/moduler/common/fish.nix b/moduler/common/fish.nix index d45a65d..a025127 100644 --- a/moduler/common/fish.nix +++ b/moduler/common/fish.nix @@ -45,6 +45,7 @@ homec="nvim ~/nix/config/home.nix"; ls="exa -lag --header"; dev="nix develop --command fish"; + spot="steam-run ~/program/spotify_player"; }; interactiveShellInit = '' set fish_greeting # Disable greeting diff --git a/moduler/common/kitty.nix b/moduler/common/kitty.nix index 93d1548..835a040 100644 --- a/moduler/common/kitty.nix +++ b/moduler/common/kitty.nix @@ -12,7 +12,7 @@ shellIntegration = { mode = "no-cursor"; }; - theme = "Catppuccin-Macchiato"; + theme = "Dracula"; settings = { confirm_os_window_close = 2; cursor_shape = "block"; diff --git a/moduler/common/ssh.nix b/moduler/common/ssh.nix index db10f2f..615ebe7 100644 --- a/moduler/common/ssh.nix +++ b/moduler/common/ssh.nix @@ -15,6 +15,11 @@ user = "fw"; identityFile = "/home/fw/.ssh/id_rsa"; }; + "lth" = { + hostname = "login.student.lth.se"; + port = 22; + user = "fr7658wa-s"; + }; }; }; } diff --git a/moduler/common/tmux.nix b/moduler/common/tmux.nix index dcae08b..047e058 100644 --- a/moduler/common/tmux.nix +++ b/moduler/common/tmux.nix @@ -7,19 +7,20 @@ tmuxPlugins.sensible # tmuxPlugins.tmux-fzf tmuxPlugins.pain-control + fw-pkgs.tmuxPlugins.spotify tmuxPlugins.sessionist { - plugin = tmuxPlugins.dracula; + plugin = fw-pkgs.tmuxPlugins.dracula; extraConfig = '' set -g @dracula-show-battery false set -g @dracula-show-powerline true # available plugins: battery, cpu-usage, git, gpu-usage, ram-usage, tmux-ram-usage, network, network-bandwidth, network-ping, ssh-session, attached-clients, network-vpn, weather, time, mpc, spotify-tui, playerctl, kubernetes-context, synchronize-panes - set -g @dracula-plugins 'playerctl git network time' + set -g @dracula-plugins 'git time' set -g @dracula-refresh-rate 10 - set -g @dracula-playerctl-format "► {{ artist }} - {{ title }}" set -g @dracula-show-timezone false set -g @dracula-military-time true set -g @dracula-day-month true + set -g @dracula-show-left-icon session ''; } tmuxPlugins.resurrect