Big changes!

This commit is contained in:
FredzyW 2024-05-24 15:20:39 +02:00
parent 4ad0a517b3
commit 9dd4c60e07
7 changed files with 42 additions and 6 deletions

View file

@ -88,7 +88,7 @@
fzf fzf
ripgrep ripgrep
spotify-tui spotify-tui
spotify-player fw-pkgs.spotify-player
alsa-lib alsa-lib
libdbusmenu libdbusmenu
xorg.libxcb xorg.libxcb

17
flake.lock generated
View file

@ -18,6 +18,22 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -158,6 +174,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"fw-pkgs": "fw-pkgs",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",

View file

@ -5,6 +5,7 @@
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
fw-pkgs.url = "github:FredzyW/fw-pkgs/master";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-23.11";
@ -21,6 +22,7 @@
nixpkgs, nixpkgs,
home-manager, home-manager,
nixpkgs-unstable, nixpkgs-unstable,
fw-pkgs,
sops-nix, sops-nix,
... ...
} @ inputs: let } @ inputs: let
@ -32,6 +34,12 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
overlay-fw-pkgs = final: prev: {
fw-pkgs = import fw-pkgs {
inherit system;
config.allowUnfree = true;
};
};
in { in {
# NixOS configuration entrypoint # NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname' # Available through 'nixos-rebuild --flake .#your-hostname'
@ -85,7 +93,11 @@
inherit inputs outputs; inherit inputs outputs;
myhostname = "laptop"; 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 { "fw@desktop" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;

View file

@ -45,6 +45,7 @@
homec="nvim ~/nix/config/home.nix"; homec="nvim ~/nix/config/home.nix";
ls="exa -lag --header"; ls="exa -lag --header";
dev="nix develop --command fish"; dev="nix develop --command fish";
spot="steam-run ~/program/spotify_player";
}; };
interactiveShellInit = '' interactiveShellInit = ''
set fish_greeting # Disable greeting set fish_greeting # Disable greeting

View file

@ -12,7 +12,7 @@
shellIntegration = { shellIntegration = {
mode = "no-cursor"; mode = "no-cursor";
}; };
theme = "Catppuccin-Macchiato"; theme = "Dracula";
settings = { settings = {
confirm_os_window_close = 2; confirm_os_window_close = 2;
cursor_shape = "block"; cursor_shape = "block";

View file

@ -15,6 +15,11 @@
user = "fw"; user = "fw";
identityFile = "/home/fw/.ssh/id_rsa"; identityFile = "/home/fw/.ssh/id_rsa";
}; };
"lth" = {
hostname = "login.student.lth.se";
port = 22;
user = "fr7658wa-s";
};
}; };
}; };
} }

View file

@ -7,19 +7,20 @@
tmuxPlugins.sensible tmuxPlugins.sensible
# tmuxPlugins.tmux-fzf # tmuxPlugins.tmux-fzf
tmuxPlugins.pain-control tmuxPlugins.pain-control
fw-pkgs.tmuxPlugins.spotify
tmuxPlugins.sessionist tmuxPlugins.sessionist
{ {
plugin = tmuxPlugins.dracula; plugin = fw-pkgs.tmuxPlugins.dracula;
extraConfig = '' extraConfig = ''
set -g @dracula-show-battery false set -g @dracula-show-battery false
set -g @dracula-show-powerline true 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 # 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-refresh-rate 10
set -g @dracula-playerctl-format " {{ artist }} - {{ title }}"
set -g @dracula-show-timezone false set -g @dracula-show-timezone false
set -g @dracula-military-time true set -g @dracula-military-time true
set -g @dracula-day-month true set -g @dracula-day-month true
set -g @dracula-show-left-icon session
''; '';
} }
tmuxPlugins.resurrect tmuxPlugins.resurrect