Compare commits
3 commits
0b07a31a9a
...
5a884d2ac6
| Author | SHA1 | Date | |
|---|---|---|---|
| 5a884d2ac6 | |||
| 97a37cdadd | |||
| dea7e4859f |
10 changed files with 189 additions and 84 deletions
202
flake.lock
generated
202
flake.lock
generated
|
|
@ -162,11 +162,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733570843,
|
||||
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
|
||||
"lastModified": 1736819234,
|
||||
"narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "a35b08d09efda83625bef267eb24347b446c80b8",
|
||||
"rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -195,6 +195,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1734969791,
|
||||
"narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -373,6 +389,59 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"stylix",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"stylix",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731363552,
|
||||
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -418,11 +487,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733484277,
|
||||
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
|
||||
"lastModified": 1736785676,
|
||||
"narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
|
||||
"rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -440,11 +509,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733085484,
|
||||
"narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
|
||||
"lastModified": 1735774425,
|
||||
"narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
|
||||
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -462,11 +531,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733448312,
|
||||
"narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=",
|
||||
"lastModified": 1736817594,
|
||||
"narHash": "sha256-3bpgIyL50b/tUj8UQijAL/4LCEJ/dJnfWvSAxHmV/94=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b",
|
||||
"revCount": 16575,
|
||||
"rev": "acbb3cff2d1a8b998135dc6f48cdd7fda85a3124",
|
||||
"revCount": 16621,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
|
@ -505,11 +574,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733661607,
|
||||
"narHash": "sha256-qqzyc2jCvzSAsXPfit4PoYAkOn+jLpb+iV7cF/d4qFs=",
|
||||
"lastModified": 1736855225,
|
||||
"narHash": "sha256-2+ayH/0B37BLPJy4thO1titHIrVCoDdCtdnl0CyV8kc=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "e1f7c6de199eb63df0c12017c0e07179e040cce2",
|
||||
"rev": "b013bedcff63b5cdbb9cd9841ac339361fc5cfcc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -521,16 +590,16 @@
|
|||
"niri-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731483594,
|
||||
"narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=",
|
||||
"lastModified": 1736614405,
|
||||
"narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "75c79116a7e40cbc0e110ce0cdd500e896458679",
|
||||
"rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "YaLTeR",
|
||||
"ref": "v0.1.10.1",
|
||||
"ref": "v25.01",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -538,11 +607,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733639139,
|
||||
"narHash": "sha256-oQ7YwoK/Hhpal6URjypm+BEB3n2S8GAJQVG8sVLC0/I=",
|
||||
"lastModified": 1736851192,
|
||||
"narHash": "sha256-579fAoE9hZtuZHlYLMH0mICaak1HPEmymiKdF/HJAig=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "9824321fc9499b9987f344308a5c5c69cb9b7a77",
|
||||
"rev": "0df7a085de6fb0ebfe7af640e60fb496e52656aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -634,11 +703,11 @@
|
|||
},
|
||||
"nix-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1733481457,
|
||||
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
|
||||
"lastModified": 1736441705,
|
||||
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
|
||||
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -693,11 +762,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1733481457,
|
||||
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
|
||||
"lastModified": 1736441705,
|
||||
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
|
||||
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -787,16 +856,16 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1733384649,
|
||||
"narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
|
||||
"lastModified": 1736684107,
|
||||
"narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
|
||||
"rev": "635e887b48521e912a516625eee7df6cf0eba9c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -818,16 +887,16 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1727184566,
|
||||
"narHash": "sha256-mgdK8BcFsLSNhe780+cHbEUbZ3OruLa1T/xgQlL4Aj4=",
|
||||
"lastModified": 1733348545,
|
||||
"narHash": "sha256-b4JrUmqT0vFNx42aEN9LTWOHomkTKL/ayLopflVf81U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "48c3030083c46042584531bc9d931020f1975677",
|
||||
"rev": "9ecb50d2fae8680be74c08bb0a995c5383747f89",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05-small",
|
||||
"ref": "nixos-24.11-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -850,11 +919,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1733581040,
|
||||
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
|
||||
"lastModified": 1736798957,
|
||||
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
|
||||
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -866,11 +935,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1733581040,
|
||||
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
|
||||
"lastModified": 1736798957,
|
||||
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
|
||||
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -897,10 +966,10 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1733392399,
|
||||
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
|
||||
"path": "/nix/store/nr5nl3zwzl02x3rnikjbry3s5xy7bm1d-source",
|
||||
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
|
||||
"lastModified": 1735834308,
|
||||
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
|
||||
"path": "/nix/store/apfqvr9kddcl6fscjvb92p4xdrqzcwk0-source",
|
||||
"rev": "6df24922a1400241dae323af55f30e4318a6ca65",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -984,11 +1053,11 @@
|
|||
"pre-commit-hooks": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726745158,
|
||||
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
|
||||
"lastModified": 1733318908,
|
||||
"narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
|
||||
"rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1062,8 +1131,10 @@
|
|||
"base16-fish": "base16-fish",
|
||||
"base16-helix": "base16-helix",
|
||||
"base16-vim": "base16-vim",
|
||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"git-hooks": "git-hooks",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager_3",
|
||||
"nixpkgs": [
|
||||
|
|
@ -1072,14 +1143,15 @@
|
|||
"systems": "systems_6",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-tmux": "tinted-tmux"
|
||||
"tinted-tmux": "tinted-tmux",
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733510476,
|
||||
"narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=",
|
||||
"lastModified": 1736779864,
|
||||
"narHash": "sha256-OgKIMua33t0ZcdcFiUntFKidwhZrRZUTLlVHJ+mAiZQ=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "e309d64fe7f203274a7913e1d2b74307d15ba122",
|
||||
"rev": "934e2bfe7954d6c94f25d45cb12a8b3547825699",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1250,6 +1322,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1725758778,
|
||||
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"waveforms": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
|
|
@ -1288,11 +1376,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732233710,
|
||||
"narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=",
|
||||
"lastModified": 1736487362,
|
||||
"narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1",
|
||||
"rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@
|
|||
./nixos/configs/fonts-linux.nix
|
||||
./nixos/configs/music-server.nix
|
||||
|
||||
#./nixos/overlays/fixup-signal
|
||||
./nixos/overlays/fixup-signal
|
||||
./nixos/overlays/fixup-imhex.nix
|
||||
./nixos/overlays/customize-gajim
|
||||
./nixos/overlays/sddm-no-vnc.nix
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
deprekages.font-monolisa
|
||||
deprekages.font-codicon
|
||||
deprekages.font-manrope
|
||||
pkgs.terminus-nerdfont
|
||||
pkgs.nerd-fonts.terminess-ttf
|
||||
pkgs.terminus_font
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
kdePackages.kwallet
|
||||
|
||||
# Terrible hack to type things in Wayland.
|
||||
(pkgs.writeScriptBin "haxtype" ''
|
||||
|
|
@ -93,6 +94,11 @@
|
|||
cat $TEMPFILE | ${wl-clipboard}/bin/wl-copy -t $MIMETYPE
|
||||
rm $TEMPFILE
|
||||
'')
|
||||
|
||||
# Set up kwallet to run as a dbus handler.
|
||||
(pkgs.writeTextDir "share/dbus-1/services/org.freedesktop.secrets.service" ''[D-BUS Service]
|
||||
Name=org.freedesktop.secrets
|
||||
Exec=${pkgs.kdePackages.kwallet}/bin/kwalletd6'')
|
||||
];
|
||||
|
||||
xdg.portal = {
|
||||
|
|
@ -102,9 +108,16 @@
|
|||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
|
||||
# Make kwallet work under niri, too.
|
||||
(pkgs.writeTextDir "share/xdg-desktop-portal/portals/kwallet-niri.portal" ''[portal]
|
||||
DBusName=org.freedesktop.impl.portal.desktop.kwallet
|
||||
Interfaces=org.freedesktop.impl.portal.Secret;
|
||||
UseIn=niri'')
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
# Set up everything per-user but niri; which is in its own module.
|
||||
home-manager.users.deprekated =
|
||||
{ pkgs, config, ... }:
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ in
|
|||
pkgs.wlrctl
|
||||
];
|
||||
|
||||
# Don't let the niri-flake fuck with our secret provider, kwallet.
|
||||
services.gnome.gnome-keyring.enable = lib.mkForce false;
|
||||
|
||||
#
|
||||
# Niri configuration.
|
||||
#
|
||||
|
|
@ -78,11 +81,13 @@ in
|
|||
#!${pkgs.bash}/bin/bash
|
||||
|
||||
while true; do
|
||||
${niri-flake.packages."${pkgs.system}".xwayland-satellite-unstable}/bin/xwayland-satellite
|
||||
${pkgs.xwayland-satellite}/bin/xwayland-satellite
|
||||
done
|
||||
'';
|
||||
in
|
||||
{
|
||||
# Don't let the niri-flake fuck with our secret provider, kwallet.
|
||||
services.gnome-keyring.enable = lib.mkForce false;
|
||||
|
||||
#
|
||||
# Core Niri settings.
|
||||
|
|
@ -321,8 +326,6 @@ in
|
|||
niri-init = pkgs.writeScriptBin "niri-init" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
systemctl --user restart swaybg
|
||||
niri msg action spawn -- gnome-keyring
|
||||
|
||||
sleep 2
|
||||
|
||||
systemctl --user stop waybar
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@
|
|||
#
|
||||
# Generic system settings.
|
||||
#
|
||||
time.timeZone = "America/Denver";
|
||||
#time.timeZone = "Europe/Amsterdam";
|
||||
time.timeZone = "Europe/Amsterdam";
|
||||
i18n.defaultLocale = "en_GB.utf8";
|
||||
|
||||
# Allow use of e.g. 'nix search' and flakes.
|
||||
|
|
@ -91,7 +90,7 @@
|
|||
services.udev.packages = [
|
||||
pkgs.minipro
|
||||
] ++ (if pkgs.stdenv.isAarch64 then [] else [
|
||||
talon.default
|
||||
#talon.default
|
||||
]);
|
||||
|
||||
services.fwupd.enable = true;
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ in
|
|||
programs.fuse.userAllowOther = true;
|
||||
|
||||
# Optimize our system for virtualisation.
|
||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
#boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
|
||||
# Disallow nouveau so the NVIDIA device is available for VFIO.
|
||||
boot.blacklistedKernelModules = [ "nouveau" ];
|
||||
|
|
@ -134,7 +134,7 @@ in
|
|||
boot.kernelParams = [
|
||||
"iommu=on"
|
||||
"amd_iommu=on"
|
||||
"pcie_acs_override=downstream,multifunction"
|
||||
#"pcie_acs_override=downstream,multifunction"
|
||||
];
|
||||
|
||||
# Enable fingerprint reader.
|
||||
|
|
|
|||
|
|
@ -14,28 +14,26 @@ let
|
|||
prev'.asar
|
||||
];
|
||||
|
||||
# Fix things to the version that our patch applies to.
|
||||
version = "7.18.0";
|
||||
src = prev'.fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-xI3GCs9ZekENktuSf9NNxoOOGuYtKrOV8Ng3eFy493M=";
|
||||
};
|
||||
|
||||
# Do terrible, terrible things.
|
||||
preFixup =
|
||||
prev.preFixup
|
||||
+ ''
|
||||
# Make this work with KDE wallet on non-kde.
|
||||
gappsWrapperArgs+=(
|
||||
--add-flags "--password-store=kwallet6"
|
||||
)
|
||||
|
||||
# Fix up the main.js in the app to actually show the window.
|
||||
pushd $out/lib/Signal/resources/
|
||||
#pushd $out/lib/Signal/resources/
|
||||
|
||||
asar extract app.asar app-unpacked
|
||||
#asar extract app.asar app-unpacked
|
||||
|
||||
pushd app-unpacked
|
||||
patch -p1 < ${./01-show-window.patch}
|
||||
popd
|
||||
#pushd app-unpacked
|
||||
#patch -p1 < ${./01-show-window.patch}
|
||||
#popd
|
||||
|
||||
asar pack app-unpacked app.asar
|
||||
popd
|
||||
#asar pack app-unpacked app.asar
|
||||
#popd
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
let
|
||||
|
||||
# Hack wine to not explode when starting MLO.
|
||||
wineWayland = (pkgs.wineWowPackages.stableFull.override { waylandSupport = true; });
|
||||
wineWayland = (pkgs.wineWowPackages.stableFull.override { waylandSupport = false; });
|
||||
wine = wineWayland.overrideAttrs (prev: {
|
||||
|
||||
patches = prev.patches ++ [
|
||||
|
|
@ -92,6 +92,10 @@ with pkgs;
|
|||
obsidian
|
||||
onboard
|
||||
|
||||
# Development.
|
||||
jetbrains.rust-rover
|
||||
jetbrains.clion
|
||||
|
||||
# Xwayland support.
|
||||
xwayland
|
||||
cage
|
||||
|
|
@ -133,7 +137,7 @@ with pkgs;
|
|||
gvfs
|
||||
|
||||
# Music stuffs.
|
||||
ardour
|
||||
#ardour
|
||||
linvstmanager
|
||||
|
||||
# 3D stuffs.
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ font_overrides = {
|
|||
hinata = 16,
|
||||
valere = 12,
|
||||
utol = 13,
|
||||
trailblazer = 10,
|
||||
trailblazer = 11,
|
||||
kanbaru = 12,
|
||||
aigis = 12;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue