erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:28e99df608c69f6896ab3232a8b4a368dd60c083
Branches Tags
erwin:main
..
compare: erwin:0de9e1303aad0bbbdf2f3db7eb5949d617f80ab0
Branches Tags
erwin:main

No commits in common. "28e99df608c69f6896ab3232a8b4a368dd60c083" and "0de9e1303aad0bbbdf2f3db7eb5949d617f80ab0" have entirely different histories.
28e99df608 ... 0de9e1303a

7 changed files with 78 additions and 77 deletions
Show stats Expand all files Collapse all files

102
flake.lock
View file

@ -54,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714980683, "lastModified": 1714557082,
"narHash": "sha256-+1/Hyq4PHEM8CX7TsSaUiODsv82IYjfu0wFZ+J9H0hU=", "narHash": "sha256-MmMpEKClQog7YlWh0XUvodNdfmzxV4lZy+awBC0yo+E=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "eebfd048797d2faffd0a9c6633580c5e3077d688", "rev": "831dd783ed41b3922ac3be8e4a849ce99c5ca272",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714959124, "lastModified": 1714612856,
"narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=", "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d", "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1714960145, "lastModified": 1714614481,
"narHash": "sha256-BlGVcAhjkPqTAbUlGjs0PVYYY54AGEq2kwiL97VwOZ8=", "narHash": "sha256-vykQwGwiu178RHmmRRTzId3qpc9YQtY29Jie7E2GFMg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "03e77b28d0e617a9961762986a9645e8fd21a8d2", "rev": "cccda8508481ea8c8ff4e50a297900ed54b26dc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714904084, "lastModified": 1714114763,
"narHash": "sha256-12ywI/J3YCvZz6BlcW7OEMVwFT5qwLW5VLYPzKyA7s0=", "narHash": "sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "a4da192d629cc43ef3da984b6f9197579a22afe1", "rev": "2c8811512460ce6cc75e021d8d081813647699dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1714641030, "lastModified": 1714606777,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,11 +563,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714976273, "lastModified": 1714515075,
"narHash": "sha256-IbYND3kbkN/GmV8pK8mglViHbdUgIJ1H48HiRPq2w3E=", "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2b87a11125f988a9f67ee63eeaa3682bc841d9b5", "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -587,11 +587,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1714764302, "lastModified": 1714072181,
"narHash": "sha256-MmIZR67wOP3Nr9b3XpsvHSZSTDcTmd9cQn2Z8pW1/Hw=", "narHash": "sha256-MOxTGzM8lgq8uo6zAy6e4ZUdzUpF/eSQPBXeH5G5BtE=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "e9977efbe34b554c3e393dc9a18509905a4080e5", "rev": "ac28e21ac336dbe01b1f1bcab01fd31db3855e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -655,11 +655,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714906042, "lastModified": 1714253190,
"narHash": "sha256-nAxkLyytuPCqAuQfgxygtyECuKv+YUSlpfstawwF7vk=", "narHash": "sha256-+9BSaBDbz3N65KgFhyJLXsIazYmpA4CUVcL4u29BIC0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld-rs", "repo": "nix-ld-rs",
"rev": "0b9c80d1f1a210eaf7ad5b066172801f3d0eda24", "rev": "d5939e6da59ea8a55b47ea48ce212f602a4fa59b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +670,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1714979072, "lastModified": 1714465198,
"narHash": "sha256-OfShHRR4QmVwEof1EWuZUygw/SFnmxfHogtCKc4vNRM=", "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "8a4adfe48b68b50ef62e9a299898093436269b6d", "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -701,14 +701,20 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1714640452, "dir": "lib",
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", "lastModified": 1714253743,
"type": "tarball", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" "owner": "NixOS",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "dir": "lib",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -729,11 +735,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1714782413, "lastModified": 1714531828,
"narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "651b4702e27a388f0f18e1b970534162dec09aff", "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -761,11 +767,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1714858427, "lastModified": 1713638189,
"narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "rev": "74574c38577914733b4f7a775dd77d24245081dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -777,11 +783,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1714253743,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -908,11 +914,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714961776, "lastModified": 1714616033,
"narHash": "sha256-LiIxWRKbm1DZ+7l1a6FMmIO8leQx5yrRLIApCMai1DY=", "narHash": "sha256-JcWAjIDl3h0bE/pII0emeHwokTeBl+SWrzwrjoRu7a0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f3b20ea4131408ea585bddb1f41f91c4de9499cf", "rev": "3e416d5067ba31ff8ac31eeb763e4388bdf45089",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -929,11 +935,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1714878026, "lastModified": 1713892811,
"narHash": "sha256-YJ1k/jyd6vKqmVgGkkAb4n+ZfPPAt8+L5a73eAThqFU=", "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "10dc39496d5b027912038bde8d68c836576ad0bc", "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home-manager/modules/git/default.nix
View file

@ -87,7 +87,7 @@ in
extraConfig = { extraConfig = {
credential = { credential = {
helper = [ helper = [
"cache --timeout 900" "cache --timeout 7200"
"${pkgs.git-credential-oauth}/bin/git-credential-oauth" "${pkgs.git-credential-oauth}/bin/git-credential-oauth"
]; ];

34
home-manager/modules/sway/default.nix
View file

@ -284,29 +284,25 @@ in
startup = cfg.startup; startup = cfg.startup;
}; };
extraConfig = builtins.concatStringsSep "\n" ( extraConfig = ''
[ for_window [app_id="^.*"] inhibit_idle fullscreen
'' for_window [class="^.*"] inhibit_idle fullscreen
for_window [app_id="^.*"] inhibit_idle fullscreen for_window [app_id="org.gnome.Calculator"] floating enable
for_window [class="^.*"] inhibit_idle fullscreen for_window [shell="xwayland"] title_format "%title [XWayland]"
for_window [app_id="org.gnome.Calculator"] floating enable for_window [app_id="^.*iwgtk$"] floating enable
for_window [shell="xwayland"] title_format "%title [XWayland]"
for_window [app_id="^.*iwgtk$"] floating enable
include /etc/sway/config.d/* blur enable
'' blur_xray disable
]
++ lib.optional (cfg.package == pkgs.swayfx) ''
blur enable
blur_xray disable
shadows enable shadows enable
default_dim_inactive 0.2 default_dim_inactive 0.2
corner_radius 10 corner_radius 10
''
);
include /etc/sway/config.d/*
'';
# exec --no-startup-id ${pkgs.swaynotificationcenter}/bin/swaync # exec --no-startup-id ${pkgs.swaynotificationcenter}/bin/swaync
# exec --no-startup-id ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator # exec --no-startup-id ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
# exec --no-startup-id ${pkgs.swayidle}/bin/swayidle -w timeout 900 "${swaylockcmd}" # exec --no-startup-id ${pkgs.swayidle}/bin/swayidle -w timeout 900 "${swaylockcmd}"

5
home-manager/modules/tmux/default.nix
View file

@ -69,9 +69,8 @@ in
bind-key C-a send-prefix bind-key C-a send-prefix
bind-key | split-window -h -c "#{pane_current_path}" bind-key | split-window -h
bind-key - split-window -v -c "#{pane_current_path}" bind-key - split-window -v
bind-key c new-window -c "#{pane_current_path}"
bind-key h select-pane -L bind-key h select-pane -L
bind-key n select-pane -D bind-key n select-pane -D

2
machines/mimir/configuration.nix
View file

@ -318,7 +318,7 @@
programs = { programs = {
sway = { sway = {
enable = true; enable = true;
package = pkgs.sway; package = pkgs.swayfx;
wrapperFeatures = { wrapperFeatures = {
gtk = true; gtk = true;
base = true; base = true;

2
modules/nix-common/default.nix
View file

@ -33,7 +33,7 @@ in
# }; # };
nix = { nix = {
package = pkgs.nixVersions.latest; package = pkgs.nixVersions.unstable;
buildMachines = mkIf cfg.remote-builders [ buildMachines = mkIf cfg.remote-builders [
{ {

8
users/erwin/work.nix
View file

@ -145,17 +145,17 @@ in
starship.enable = true; starship.enable = true;
sway = { sway = {
enable = true; enable = true;
package = pkgs.sway; package = pkgs.swayfx;
wayvnc = true; wayvnc = true;
lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png"; lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png";
output = { output = {
"DP-1" = { "DP-1" = {
bg = "${../../wallpapers/river-3840.png} fill"; bg = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png fill";
mode = "3840x2160@60Hz"; mode = "3840x2160@60Hz";
position = "0 0"; position = "0 0";
}; };
"DP-3" = { "DP-3" = {
bg = "${../../wallpapers/river-3840.png} fill"; bg = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png fill";
mode = "3840x2160@60Hz"; mode = "3840x2160@60Hz";
position = "3840 0"; position = "3840 0";
}; };
@ -409,7 +409,7 @@ in
services = { services = {
livebook = { livebook = {
enableUserService = false; enableUserService = true;
environmentFile = pkgs.writeText "livebook-env" '' environmentFile = pkgs.writeText "livebook-env" ''
LIVEBOOK_TOKEN_ENABLED=false LIVEBOOK_TOKEN_ENABLED=false
LIVEBOOK_IDENTITY_PROVIDER=tailscale:/run/tailscale/tailscaled.sock LIVEBOOK_IDENTITY_PROVIDER=tailscale:/run/tailscale/tailscaled.sock