Compare commits

...

2 Commits

Author SHA1 Message Date
86556fb69f flake: update 2024-12-31 12:44:05 +01:00
049d3d82c6 sisko: Various fixes. Add amalieem. 2024-12-31 12:44:05 +01:00
6 changed files with 72 additions and 14 deletions

24
flake.lock generated
View File

@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734366194, "lastModified": 1735344290,
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733570843, "lastModified": 1735478292,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8", "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1734424634, "lastModified": 1735471104,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1734323986, "lastModified": 1735531152,
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "394571358ce82dff7411395829aa6a3aad45b907", "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -69,7 +69,9 @@
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users."felixalb" = import ./hosts/${name}/home.nix; home-manager.users = {
"felixalb" = import ./hosts/${name}/home.nix;
} // config.home-manager-users or { };
} }
] ++ config.modules or [ ]; ] ++ config.modules or [ ];
}; };
@ -104,7 +106,9 @@
malcolm = normalSys "malcolm" { }; malcolm = normalSys "malcolm" { };
# Home desktop # Home desktop
sisko = normalSys "sisko" { }; sisko = normalSys "sisko" {
home-manager-users."amalieem" = import ./home/amalieem;
};
}; };
# Daily driver macbook # Daily driver macbook

44
home/amalieem/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ pkgs, lib, ... }:
{
imports = [
./../alacritty.nix
];
home = {
packages = with pkgs; [
papers
kitty
pavucontrol
# Window Manager Extras
bibata-cursors
hyprcursor
hypridle
hyprlock
hyprpaper
hyprshot
nautilus
networkmanager
swaynotificationcenter
waybar
wl-clipboard
];
sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
};
};
programs = {
alacritty = {
enable = true;
settings.window.opacity = 0.92;
};
firefox.enable = true;
neovim.plugins = with pkgs.vimPlugins; [ copilot-vim ];
wofi.enable = true;
};
home.stateVersion = "24.11";
}

View File

@ -106,6 +106,8 @@ in {
autocmd VimEnter * wincmd p " Unselect nerdtree window autocmd VimEnter * wincmd p " Unselect nerdtree window
endif endif
autocmd Filetype go setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4
" List and switch buffers on Ctrl+k " List and switch buffers on Ctrl+k
" nnoremap <C-k> :set nomore <Bar> :ls <Bar> :set more <CR>:b<Space> " nnoremap <C-k> :set nomore <Bar> :ls <Bar> :set more <CR>:b<Space>
nnoremap <silent> <C-k> !echo "Did you mean C-a?"<CR> nnoremap <silent> <C-k> !echo "Did you mean C-a?"<CR>

View File

@ -33,6 +33,11 @@
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
}; };
users.users."amalieem" = {
isNormalUser = true;
home = "/home/amalieem";
};
nixpkgs.config = { nixpkgs.config = {
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"copilot.vim" "copilot.vim"

View File

@ -21,6 +21,7 @@
prismlauncher prismlauncher
swayimg swayimg
spotify spotify
thunderbird
# Window Manager Extras # Window Manager Extras
bibata-cursors bibata-cursors
@ -43,6 +44,7 @@
catimg catimg
dante dante
dig dig
go
hunspellDicts.en_US hunspellDicts.en_US
hunspellDicts.nb_NO hunspellDicts.nb_NO
jq jq
@ -112,6 +114,7 @@
"x-scheme-handler/about" = "firefox.desktop"; "x-scheme-handler/about" = "firefox.desktop";
"x-scheme-handler/unknown" = "firefox.desktop"; "x-scheme-handler/unknown" = "firefox.desktop";
"inode/directory" = "org.gnome.Nautilus.desktop";
"application/pdf" = "org.gnome.Papers.desktop"; "application/pdf" = "org.gnome.Papers.desktop";
} // builtins.listToAttrs ( } // builtins.listToAttrs (