Compare commits

...

6 commits

Author SHA1 Message Date
28e99df608
nix: nixVersions.unstable -> nixVersions.latest 2024-05-07 08:47:22 +02:00
c20c3e53a6
mimir: Switch back to sway 2024-05-07 08:47:08 +02:00
e1b57f636d
tmux: Spawn new windows and splits in the current directory 2024-05-07 08:46:46 +02:00
8ddfb16749
sway: Only add swayfx config if it is being used 2024-05-07 08:46:26 +02:00
a54b182775
git: Decrease credential cache to 15 minutes 2024-05-07 08:45:42 +02:00
268e406443
flake.lock: Update
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/831dd783ed41b3922ac3be8e4a849ce99c5ca272?narHash=sha256-MmMpEKClQog7YlWh0XUvodNdfmzxV4lZy%2BawBC0yo%2BE%3D' (2024-05-01)
  → 'github:atuinsh/atuin/eebfd048797d2faffd0a9c6633580c5e3077d688?narHash=sha256-%2B1/Hyq4PHEM8CX7TsSaUiODsv82IYjfu0wFZ%2BJ9H0hU%3D' (2024-05-06)
• Updated input 'disko':
    'github:nix-community/disko/d57058eb09dd5ec00c746df34fe0a603ea744370?narHash=sha256-W7%2BrtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E%3D' (2024-05-02)
  → 'github:nix-community/disko/e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d?narHash=sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk%3D' (2024-05-06)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/cccda8508481ea8c8ff4e50a297900ed54b26dc3?narHash=sha256-vykQwGwiu178RHmmRRTzId3qpc9YQtY29Jie7E2GFMg%3D' (2024-05-02)
  → 'github:nix-community/emacs-overlay/03e77b28d0e617a9961762986a9645e8fd21a8d2?narHash=sha256-BlGVcAhjkPqTAbUlGjs0PVYYY54AGEq2kwiL97VwOZ8%3D' (2024-05-06)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/0638fe2715d998fa81d173aad264eb671ce2ebc1?narHash=sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg%3D' (2024-05-01)
  → 'github:NixOS/nixpkgs/651b4702e27a388f0f18e1b970534162dec09aff?narHash=sha256-tbg0MEuKaPcUrnmGCu4xiY5F%2B7LW2%2BECPKVAJd2HLwM%3D' (2024-05-04)
• Updated input 'eww':
    'github:elkowar/eww/2c8811512460ce6cc75e021d8d081813647699dc?narHash=sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM%3D' (2024-04-26)
  → 'github:elkowar/eww/a4da192d629cc43ef3da984b6f9197579a22afe1?narHash=sha256-12ywI/J3YCvZz6BlcW7OEMVwFT5qwLW5VLYPzKyA7s0%3D' (2024-05-05)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/4d34ce6412bc450b1d4208c953dc97c7fc764f1a?narHash=sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA%3D' (2024-05-01)
  → 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e?narHash=sha256-yzcRNDoyVP7%2BSCNX0wmuDju1NUCt8Dz9%2BlyUXEI0dbI%3D' (2024-05-02)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994?dir=lib&narHash=sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc%3D' (2024-04-27)
  → '50eb7ecf4c.tar.gz?narHash=sha256-QBx10%2Bk6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94%3D' (2024-05-02)
• Updated input 'home-manager':
    'github:nix-community/home-manager/6d3b6dc9222c12b951169becdf4b0592ee9576ef?narHash=sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY%3D' (2024-04-30)
  → 'github:nix-community/home-manager/2b87a11125f988a9f67ee63eeaa3682bc841d9b5?narHash=sha256-IbYND3kbkN/GmV8pK8mglViHbdUgIJ1H48HiRPq2w3E%3D' (2024-05-06)
• Updated input 'microvm':
    'github:astro/microvm.nix/ac28e21ac336dbe01b1f1bcab01fd31db3855e40?narHash=sha256-MOxTGzM8lgq8uo6zAy6e4ZUdzUpF/eSQPBXeH5G5BtE%3D' (2024-04-25)
  → 'github:astro/microvm.nix/e9977efbe34b554c3e393dc9a18509905a4080e5?narHash=sha256-MmIZR67wOP3Nr9b3XpsvHSZSTDcTmd9cQn2Z8pW1/Hw%3D' (2024-05-03)
• Updated input 'nix-ld-rs':
    'github:nix-community/nix-ld-rs/d5939e6da59ea8a55b47ea48ce212f602a4fa59b?narHash=sha256-%2B9BSaBDbz3N65KgFhyJLXsIazYmpA4CUVcL4u29BIC0%3D' (2024-04-27)
  → 'github:nix-community/nix-ld-rs/0b9c80d1f1a210eaf7ad5b066172801f3d0eda24?narHash=sha256-nAxkLyytuPCqAuQfgxygtyECuKv%2BYUSlpfstawwF7vk%3D' (2024-05-05)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/68d680c1b7c0e67a9b2144d6776583ee83664ef4?narHash=sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI%3D' (2024-04-30)
  → 'github:NixOS/nixos-hardware/8a4adfe48b68b50ef62e9a299898093436269b6d?narHash=sha256-OfShHRR4QmVwEof1EWuZUygw/SFnmxfHogtCKc4vNRM%3D' (2024-05-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994?narHash=sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc%3D' (2024-04-27)
  → 'github:nixos/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588?narHash=sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0%3D' (2024-05-05)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/3e416d5067ba31ff8ac31eeb763e4388bdf45089?narHash=sha256-JcWAjIDl3h0bE/pII0emeHwokTeBl%2BSWrzwrjoRu7a0%3D' (2024-05-02)
  → 'github:oxalica/rust-overlay/f3b20ea4131408ea585bddb1f41f91c4de9499cf?narHash=sha256-LiIxWRKbm1DZ%2B7l1a6FMmIO8leQx5yrRLIApCMai1DY%3D' (2024-05-06)
• Updated input 'sops':
    'github:Mic92/sops-nix/f1b0adc27265274e3b0c9b872a8f476a098679bd?narHash=sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln%2BaXnWrvjGRE%3D' (2024-04-23)
  → 'github:Mic92/sops-nix/10dc39496d5b027912038bde8d68c836576ad0bc?narHash=sha256-YJ1k/jyd6vKqmVgGkkAb4n%2BZfPPAt8%2BL5a73eAThqFU%3D' (2024-05-05)
• Updated input 'sops/nixpkgs-stable':
    'github:NixOS/nixpkgs/74574c38577914733b4f7a775dd77d24245081dd?narHash=sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk%3D' (2024-04-20)
  → 'github:NixOS/nixpkgs/b980b91038fc4b09067ef97bbe5ad07eecca1e76?narHash=sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M%3D' (2024-05-04)
2024-05-06 10:09:15 +02:00
7 changed files with 77 additions and 78 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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