Compare commits

...

2 commits

Author SHA1 Message Date
4be92b6e04
Remove thefuck
Was never used, causes issues on nixos
2025-09-13 17:06:05 +02:00
nixos-install.sh
e5be15f7e7
Use rolling release nix, no long term support version 2025-09-13 17:03:42 +02:00
4 changed files with 14 additions and 30 deletions

View file

@ -10,8 +10,6 @@ alias v="nvim"
alias vi="nvim" alias vi="nvim"
alias vim="nvim" alias vim="nvim"
alias f="fuck"
alias irssi='irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi' alias irssi='irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi'
alias unison="unison -logfile ~/.unison/unison.log" alias unison="unison -logfile ~/.unison/unison.log"

2
_zshrc
View file

@ -44,8 +44,6 @@ fi
setopt interactivecomments setopt interactivecomments
setopt HIST_IGNORE_SPACE setopt HIST_IGNORE_SPACE
eval $(thefuck --alias)
export PS1=" export PS1="
%{$(tput bold)%}%{$(tput setaf 1)%}[%{$(tput setaf 3)%}%n%{$(tput setaf 2)%}@%{$(tput setaf 4)%}%M %{$(tput setaf 5)%}%~%{$(tput setaf 1)%}]%{$(tput setaf 7)%} %{$(tput bold)%}%{$(tput setaf 1)%}[%{$(tput setaf 3)%}%n%{$(tput setaf 2)%}@%{$(tput setaf 4)%}%M %{$(tput setaf 5)%}%~%{$(tput setaf 1)%}]%{$(tput setaf 7)%}
$ %{$(tput sgr0)%}" $ %{$(tput sgr0)%}"

14
flake.lock generated
View file

@ -148,16 +148,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1757698511,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "a3fcc92180c7462082cd849498369591dfb20855",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -220,16 +219,15 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1735563628, "lastModified": 1757773722,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "narHash": "sha256-DwxmQZ9D+hEe7h968RvFIVm6gidiVpGKZl8HanbI7FY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "rev": "b8df34ffe22cfc4f6c6229aa29d8ee67657cbec0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -2,9 +2,9 @@
description = "OSHs dotfiles"; description = "OSHs dotfiles";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -13,16 +13,15 @@
system = builtins.currentSystem; system = builtins.currentSystem;
username = builtins.getEnv "USER"; username = builtins.getEnv "USER";
homeDir = builtins.getEnv "HOME"; homeDir = builtins.getEnv "HOME";
pkgs = import nixpkgs { inherit system; }; overlays = [
neovim-nightly-overlay.overlays.default
];
pkgs = import nixpkgs { inherit system overlays; };
in { in {
homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = [ modules = [
{ {
nixpkgs.overlays = [
neovim-nightly-overlay.overlays.default
];
home.username = username; home.username = username;
home.homeDirectory = homeDir; home.homeDirectory = homeDir;
# Only manage what you explicitly turn on below # Only manage what you explicitly turn on below
@ -49,11 +48,7 @@
autosuggestion.enable = true; autosuggestion.enable = true;
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
initExtra = '' initContent = ''
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
source ${pkgs.fzf}/share/fzf/completion.zsh
source ${pkgs.fzf-zsh}/share/zsh/plugins/fzf-zsh/fzf-zsh.plugin.zsh
[ -f "$HOME/.config/zshrc" ] && source $HOME/.config/zshrc [ -f "$HOME/.config/zshrc" ] && source $HOME/.config/zshrc
''; '';
@ -96,9 +91,6 @@
fd fd
tmux tmux
xsel xsel
fzf
fzf-zsh
thefuck
rust-analyzer rust-analyzer
jq jq
]; ];
@ -119,14 +111,12 @@
force = true; force = true;
}; };
# Environment variables only for this user/session
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
}; };
# Good HM hygiene
xdg.enable = true; xdg.enable = true;
home.stateVersion = "24.05"; home.stateVersion = "25.11";
} }
]; ];
}; };