Compare commits
6 commits
0de9e1303a
...
28e99df608
Author | SHA1 | Date | |
---|---|---|---|
28e99df608 | |||
c20c3e53a6 | |||
e1b57f636d | |||
8ddfb16749 | |||
a54b182775 | |||
268e406443 |
7 changed files with 77 additions and 78 deletions
102
flake.lock
102
flake.lock
|
@ -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": {
|
||||
|
|
|
@ -87,7 +87,7 @@ in
|
|||
extraConfig = {
|
||||
credential = {
|
||||
helper = [
|
||||
"cache --timeout 7200"
|
||||
"cache --timeout 900"
|
||||
"${pkgs.git-credential-oauth}/bin/git-credential-oauth"
|
||||
];
|
||||
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -318,7 +318,7 @@
|
|||
programs = {
|
||||
sway = {
|
||||
enable = true;
|
||||
package = pkgs.swayfx;
|
||||
package = pkgs.sway;
|
||||
wrapperFeatures = {
|
||||
gtk = true;
|
||||
base = true;
|
||||
|
|
|
@ -33,7 +33,7 @@ in
|
|||
# };
|
||||
|
||||
nix = {
|
||||
package = pkgs.nixVersions.unstable;
|
||||
package = pkgs.nixVersions.latest;
|
||||
|
||||
buildMachines = mkIf cfg.remote-builders [
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue