aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: aciceri:b16d868f853bc17e1f29d395b5747eb396040d51
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test
...
compare: aciceri:d20b7d696b51a307114781bd2eb6861ecaeb2426
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test

6 commits
b16d868f85 ... d20b7d696b

Author SHA1 Message Date
Seven of Nine
d20b7d696b flake.lock: Update
Some checks failed
/ test (push) Failing after 21m46s
Details 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/e55f9a8678adc02024a4877c2a403e3f6daf24fe' (2024-09-03)
  → 'github:nix-community/disko/49b22d486c2bd1ce3102881c948e58c14b58152a' (2024-09-23)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/3fd4c14d3683baac8d1f94286ae14fe160888b51' (2024-08-01)
  → 'github:nix-community/dream2nix/b76c529f377100516c40c5b6e239a4525fdcabe0' (2024-09-16)
• Updated input 'flakeParts':
    'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6' (2024-09-01)
  → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=c14486ae8d3bbc862c625d948a6b2f4dc0927d5b' (2024-09-09)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=5f298f74c92402a8390b01c736463b17b36277e3' (2024-09-21)
• Updated input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=353b25f0b6da5ede15206d416345a2ec4195b5c8' (2024-09-08)
  → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=b0e6f359500d66670cc16f521e4f62d6a0a4864e' (2024-09-18)
• Updated input 'lix-module/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/672f8299e484301994858d9220921309f631d616' (2024-09-06)
  → 'github:NixOS/mobile-nixos/a386813d9ec46fa32e51488f7d48c0e1bde77f8e' (2024-09-21)
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/76559183801030451e200c90a1627c1d82bb4910' (2024-09-06)
  → 'github:LnL7/nix-darwin/bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d' (2024-09-22)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/166dee4f88a7e3ba1b7a243edb1aca822f00680e' (2024-09-09)
  → 'github:NixOS/nixos-hardware/d0cb432a9d28218df11cbd77d984a2a46caeb5ac' (2024-09-22)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/268bb5090a3c6ac5e1615b38542a868b52ef8088' (2024-09-19)
  → 'github:NixOS/nixpkgs/ea9a0aed95904e86dd0084a70c8ecd89a28e9c0a' (2024-09-23)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd' (2024-09-02)
  → 'github:numtide/treefmt-nix/ee41a466c2255a3abe6bc50fc6be927cdee57a9f' (2024-09-19)
 2024-09-23 13:01:52 +00:00
Andrea Ciceri
2686ad6086
Re-enable url-literals deprecated feature
Some checks failed
/ test (push) Failing after 26m16s
Details
2024-09-23 13:47:34 +02:00
Andrea Ciceri
4caa879c4e
Enable catppuccin on picard 2024-09-23 13:47:17 +02:00
Andrea Ciceri
7d5c1d1860
Add catppuccin flake input 2024-09-23 13:45:09 +02:00
Andrea Ciceri
b1a17f605d
Remove wezterm patch
All checks were successful
/ test (push) Successful in 24m33s
Details 
Still doesn't work but at least it starts now
 2024-09-23 09:54:40 +02:00
Andrea Ciceri
60d5495bed
Removed unused emacs 2024-09-23 09:54:07 +02:00
14 changed files with 140 additions and 7516 deletions
Show stats Expand all files Collapse all files

92
flake.lock generated
View file

@ -21,6 +21,21 @@
"type": "github" "type": "github"
} }
}, },
"catppuccin": {
"locked": {
"lastModified": 1726952185,
"narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
"owner": "catppuccin",
"repo": "nix",
"rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"crane": { "crane": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -71,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725377834, "lastModified": 1727086915,
"narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "narHash": "sha256-mqoWnKQRbA3AsyW9cg9ttqKvOY0IvdEz+/lf1qwsKnE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "rev": "49b22d486c2bd1ce3102881c948e58c14b58152a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +106,11 @@
"pyproject-nix": "pyproject-nix" "pyproject-nix": "pyproject-nix"
}, },
"locked": { "locked": {
"lastModified": 1722526955, "lastModified": 1726523340,
"narHash": "sha256-fFS8aDnfK9Qfm2FLnQ8pqWk8FzvFEv5LvTuZTZLREnc=", "narHash": "sha256-Av5mdR2lAGUVdA6DJ8Anon3/FZg3DX4gl1Ff72rCpKU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "3fd4c14d3683baac8d1f94286ae14fe160888b51", "rev": "b76c529f377100516c40c5b6e239a4525fdcabe0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +250,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +286,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1726153070,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +448,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725863684, "lastModified": 1726985855,
"narHash": "sha256-HmdTBpuCsw35Ii35JUKO6AE6nae+kJliQb0XGd4hoLE=", "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "be47a2bdf278c57c2d05e747a13ed31cef54a037", "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +542,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725846500, "lastModified": 1726905313,
"narHash": "sha256-8tzJO3PllVPc0RYE0OfXVWlgTiJxKH1nzXsQLGyFRJ4=", "narHash": "sha256-jsOyXonevsNaKxM9burYc2S4JVle+VMCJ8+AAp0MDCc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c14486ae8d3bbc862c625d948a6b2f4dc0927d5b", "rev": "5f298f74c92402a8390b01c736463b17b36277e3",
"revCount": 16226, "revCount": 16254,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -552,11 +567,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725836728, "lastModified": 1726631249,
"narHash": "sha256-dCbHCwqrzcHlEsRilMX+KM3IfRV46ieGqDyAD3GgCSs=", "narHash": "sha256-b2rMO8+jKjY55d8uynX7FjV4NIPu/WzPux0kWOAzwoo=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "353b25f0b6da5ede15206d416345a2ec4195b5c8", "rev": "b0e6f359500d66670cc16f521e4f62d6a0a4864e",
"revCount": 107, "revCount": 110,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -568,11 +583,11 @@
"mobile-nixos": { "mobile-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725601293, "lastModified": 1726960027,
"narHash": "sha256-PLk1m0ZukClV+qrszd6WaNclpge8zGsSBTOAwYB9es4=", "narHash": "sha256-BJe+6Gpqu98Mhi1oAfrJK25SZvvQgfYqpmLaXvXgQ9g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "mobile-nixos", "repo": "mobile-nixos",
"rev": "672f8299e484301994858d9220921309f631d616", "rev": "a386813d9ec46fa32e51488f7d48c0e1bde77f8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +652,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725628909, "lastModified": 1727003835,
"narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=", "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "76559183801030451e200c90a1627c1d82bb4910", "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +691,11 @@
}, },
"nixosHardware": { "nixosHardware": {
"locked": { "locked": {
"lastModified": 1725885300, "lastModified": 1727040444,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -882,11 +897,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1726745986, "lastModified": 1727094993,
"narHash": "sha256-xB35C2fpz7iyNcj9sn0a+wM2C4CQ6DGTn5VUHogstYs=", "narHash": "sha256-cf1MsBKTkEK3aDgEADqCu1MqffUMkVefPZTk6p29dU8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "268bb5090a3c6ac5e1615b38542a868b52ef8088", "rev": "ea9a0aed95904e86dd0084a70c8ecd89a28e9c0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1089,6 +1104,7 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"catppuccin": "catppuccin",
"disko": "disko", "disko": "disko",
"dream2nix": "dream2nix", "dream2nix": "dream2nix",
"flakeParts": "flakeParts", "flakeParts": "flakeParts",
@ -1259,11 +1275,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725271838, "lastModified": 1726734507,
"narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -59,6 +59,7 @@
url = "github:nix-community/lanzaboote"; url = "github:nix-community/lanzaboote";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
catppuccin.url = "github:catppuccin/nix";
}; };
outputs = outputs =

12
hmModules/btop/default.nix
View file

@ -1,21 +1,9 @@
{ pkgs, ... }:
{ {
programs.btop = { programs.btop = {
enable = true; enable = true;
settings = { settings = {
update_ms = 100; update_ms = 100;
theme_background = false; theme_background = false;
# color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
color_theme =
let
catppuccin-theme = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "btop";
rev = "21b8d5956a8b07fa52519e3267fb3a2d2e693d17";
hash = "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=";
};
in
"${catppuccin-theme}/themes/catppuccin_mocha.theme";
}; };
}; };
} }

39
hmModules/catppuccin/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib, ... }:
{
catppuccin = {
enable = true;
flavor = "mocha";
accent = "sapphire";
};
qt = {
platformTheme.name = lib.mkForce "kvantum";
style.name = lib.mkForce "kvantum";
};
# TODO move away
programs.alacritty = {
enable = true;
settings = {
font = {
normal = {
family = "Fira Code";
style = "Regular";
};
bold = {
family = "Fira Code";
style = "Bold";
};
italic = {
family = "Cascadia Code";
style = "Italic";
};
bold_italic = {
family = "Fira Code";
style = "Bold Italic";
};
size = 13;
};
};
};
}

73
hmModules/foot/default.nix
View file

@ -1,59 +1,50 @@
{ {
lib, lib,
pkgs,
config, config,
... ...
}: }:
lib.mkMerge [ lib.mkMerge [
{ {
programs.foot = programs.foot = {
let enable = true;
catppuccin = pkgs.fetchFromGitHub { server.enable = true;
owner = "catppuccin"; settings = {
repo = "foot"; main = {
rev = "307611230661b7b1787feb7f9d122e851bae97e9"; term = "xterm-256color";
hash = "sha256-mkPYHDJtfdfDnqLr1YOjaBpn4lCceok36LrnkUkNIE4="; login-shell = "yes";
}; dpi-aware = "no";
in horizontal-letter-offset = "1";
{ font =
enable = true; let
server.enable = true; size = "13";
settings = { in
main = { lib.mkForce (
term = "xterm-256color";
login-shell = "yes";
dpi-aware = "no";
horizontal-letter-offset = "1";
include = "${catppuccin}/themes/catppuccin-mocha.ini";
font =
let
size = "13";
in
lib.concatStringsSep ", " [ lib.concatStringsSep ", " [
"Iosevka Comfy:size=${size}" "Iosevka Comfy:size=${size}"
"Symbols Nerd Font:size=${size}" "Symbols Nerd Font:size=${size}"
"JoyPixels:size=${size}" "JoyPixels:size=${size}"
]; ]
}; );
cursor = { };
blink = true; cursor = {
}; blink = true;
tweak = { };
overflowing-glyphs = true; tweak = {
}; overflowing-glyphs = true;
};
key-bindings = { key-bindings = {
scrollback-up-page = "Control+Shift+k"; scrollback-up-page = "Control+Shift+k";
scrollback-down-page = "Control+Shift+j"; scrollback-down-page = "Control+Shift+j";
search-start = "Control+Shift+s"; search-start = "Control+Shift+s";
pipe-command-output = ''[sh -c 'f=$(mktemp); cat - > $f; footclient hx $f; rm $f'] Control+Shift+g''; pipe-command-output = ''[sh -c 'f=$(mktemp); cat - > $f; footclient hx $f; rm $f'] Control+Shift+g'';
}; };
mouse = { mouse = {
hide-when-typing = "yes"; hide-when-typing = "yes";
};
}; };
}; };
};
} }
(lib.mkIf config.programs.fish.enable { (lib.mkIf config.programs.fish.enable {
programs.fish.functions = { programs.fish.functions = {

1
hmModules/helix/default.nix
View file

@ -12,7 +12,6 @@
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
settings = { settings = {
theme = "catppuccin_mocha";
editor = { editor = {
indent-guides.render = true; indent-guides.render = true;
cursor-shape = { cursor-shape = {

13
hmModules/hyprland/default.nix
View file

@ -56,21 +56,20 @@ in
gtk = { gtk = {
enable = true; enable = true;
font.name = "Sans,Symbols Nerd Font"; # font.name = lib.mkForce "Sans,Symbols Nerd Font";
iconTheme = { iconTheme = {
name = "Adwaita"; name = "Adwaita";
package = pkgs.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
}; };
cursorTheme = { # cursorTheme = {
name = "catppuccin-mocha-sapphire"; # name = "catppuccin-mocha-sapphire";
package = pkgs.catppuccin-cursors; # package = pkgs.catppuccin-cursors;
size = 48; # size = 48;
}; # };
}; };
qt = { qt = {
enable = true; enable = true;
platformTheme.name = "gtk3";
}; };
# services.kanshi = { # services.kanshi = {

40
hmModules/shell/default.nix
View file

@ -116,45 +116,11 @@
# ''; # '';
# }; # };
xdg.configFile = {
"dracula-theme" = {
target = "fish/themes/dracula.theme";
source =
let
theme = pkgs.fetchFromGitHub {
owner = "dracula";
repo = "fish";
rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
};
in
"${theme}/themes/Dracula\ Official.theme";
};
"catppuccin-theme" = {
target = "fish/themes/Catppuccin\ Mocha.theme";
source =
let
theme = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "fish";
rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf";
hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
};
in
"${theme}/themes/Catppuccin\ Mocha.theme";
};
};
programs.fish = { programs.fish = {
enable = true; enable = true;
shellInit = shellInit = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
'' export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
fish_config theme choose "dracula" '';
fish_config theme choose "Catppuccin Mocha"
''
+ lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
'';
shellAliases = { shellAliases = {
"cat" = "bat"; "cat" = "bat";
}; };

2
hmModules/sway/default.nix
View file

@ -28,7 +28,7 @@
gtk = { gtk = {
enable = true; enable = true;
font.name = "Sans,Symbols Nerd Font"; font.name = lib.mkForce "Sans,Symbols Nerd Font";
iconTheme = { iconTheme = {
name = "Adwaita"; name = "Adwaita";
package = pkgs.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;

7319
hmModules/wezterm/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

58
hmModules/wezterm/default.nix
View file

@ -1,64 +1,6 @@
{
pkgs,
hostname,
...
}:
{ {
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
package =
if hostname == "pircard" then
(pkgs.wezterm.overrideAttrs (old: rec {
pname = "wezterm";
version = "20240406-cce0706";
src = pkgs.fetchFromGitHub {
owner = "wez";
repo = "${pname}";
rev = "cce0706b1f2a9e2d1f02c57f2d1cd367c91df1ae";
fetchSubmodules = true;
hash = "sha256-BBPxidOpFrw/tIRTqMSREyJF3QEWOwlIoVRT3FD62sQ=";
};
cargoDeps = pkgs.rustPlatform.importCargoLock {
lockFile = "${src}/Cargo.lock";
outputHashes = {
"xcb-imdkit-0.3.0" = "sha256-fTpJ6uNhjmCWv7dZqVgYuS2Uic36XNYTbqlaly5QBjI=";
};
};
patches = (old.patches or [ ]) ++ [
(pkgs.fetchpatch {
# fix(wayland): ensure repaint event is sent in show
url = "https://patch-diff.githubusercontent.com/raw/wez/wezterm/pull/5264.patch";
hash = "sha256-c+frVaBEL0h3PJvNu3AW2iap+uUXBY8olbm7Wsxuh4Q=";
})
(pkgs.writeText "wezterm-remove_capabilities.patch" ''
diff --git a/window/src/os/wayland/seat.rs b/window/src/os/wayland/seat.rs
index 3798f4259..e91591130 100644
--- a/window/src/os/wayland/seat.rs
+++ b/window/src/os/wayland/seat.rs
@@ -65,9 +65,15 @@ impl SeatHandler for WaylandState {
_conn: &Connection,
_qh: &QueueHandle<Self>,
_seat: WlSeat,
- _capability: smithay_client_toolkit::seat::Capability,
+ capability: smithay_client_toolkit::seat::Capability,
) {
- todo!()
+ if capability == Capability::Keyboard && self.keyboard.is_some() {
+ self.keyboard.take().unwrap().release();
+ }
+
+ if capability == Capability::Pointer && self.pointer.is_some() {
+ self.pointer = None;
+ }
}
fn remove_seat(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>, _seat: WlSeat) {
'')
];
}))
else
pkgs.wezterm;
extraConfig = '' extraConfig = ''
return { return {
-- enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483 -- enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483

2
hosts/default.nix
View file

@ -68,11 +68,13 @@
inputs.nixThePlanet.nixosModules.macos-ventura inputs.nixThePlanet.nixosModules.macos-ventura
inputs.lix-module.nixosModules.default inputs.lix-module.nixosModules.default
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.catppuccin.nixosModules.catppuccin
]; ];
extraHmModules = [ extraHmModules = [
# inputs.ccrEmacs.hmModules.default # inputs.ccrEmacs.hmModules.default
"${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix" "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
inputs.vscode-server.nixosModules.home inputs.vscode-server.nixosModules.home
inputs.catppuccin.homeManagerModules.catppuccin
]; ];
secrets = { secrets = {
"picard-wireguard-private-key" = { }; "picard-wireguard-private-key" = { };

2
hosts/picard/default.nix
View file

@ -58,7 +58,6 @@
"element" "element"
"zmkbatx" "zmkbatx"
"tremotesf" "tremotesf"
# "emacs"
"firefox" "firefox"
"gpg" "gpg"
"mpv" "mpv"
@ -85,6 +84,7 @@
"reinstall-magisk-on-lineage" "reinstall-magisk-on-lineage"
"vscode-server" "vscode-server"
"zk" "zk"
"catppuccin"
]; ];
extraGroups = [ ]; extraGroups = [ ];
backupPaths = [ ]; backupPaths = [ ];

2
modules/nix/default.nix
View file

@ -32,7 +32,7 @@
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M=" "mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M="
]; ];
# deprecated-features = [ "url-literals" ]; deprecated-features = [ "url-literals" ];
}; };
nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ]; nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ];