swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 17:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update nixpkgs

Browse source
This commit is contained in:
Leon Schwarzäugl 2025-02-25 13:57:00 +01:00
parent bba479852b
commit 5b591ba10b
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
9 changed files with 520 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

228
SwarselSystems.org
View file

@ -886,15 +886,15 @@ My work machine. Built for more security, this is the gold standard of my config
resumeDevice = "/dev/disk/by-label/nixos"; resumeDevice = "/dev/disk/by-label/nixos";
}; };
# hardware = { hardware = {
# amdgpu = { amdgpu = {
# opencl.enable = true; opencl.enable = true;
# amdvlk = { amdvlk = {
# enable = true; enable = true;
# support32Bit.enable = true; support32Bit.enable = true;
# }; };
# }; };
# }; };
programs.fw-fanctrl.enable = true; programs.fw-fanctrl.enable = true;
@ -4259,50 +4259,52 @@ Set in firefox =about:config > toolkit.legacyUserProfileCustomizations.styleshee
default = { default = {
isDefault = false; isDefault = false;
userChrome = builtins.readFile "${self}/programs/firefox/chrome/userChrome.css"; userChrome = builtins.readFile "${self}/programs/firefox/chrome/userChrome.css";
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ extensions = {
tridactyl packages = with pkgs.nur.repos.rycee.firefox-addons; [
tampermonkey tridactyl
sidebery tampermonkey
browserpass sidebery
clearurls browserpass
darkreader clearurls
enhancer-for-youtube darkreader
istilldontcareaboutcookies enhancer-for-youtube
translate-web-pages istilldontcareaboutcookies
ublock-origin translate-web-pages
reddit-enhancement-suite ublock-origin
sponsorblock reddit-enhancement-suite
web-archives sponsorblock
onepassword-password-manager web-archives
single-file onepassword-password-manager
widegithub single-file
enhanced-github widegithub
unpaywall enhanced-github
don-t-fuck-with-paste unpaywall
plasma-integration don-t-fuck-with-paste
(buildFirefoxXpiAddon { plasma-integration
pname = "shortkeys"; (buildFirefoxXpiAddon {
version = "4.0.2"; pname = "shortkeys";
addonId = "Shortkeys@Shortkeys.com"; version = "4.0.2";
url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi"; addonId = "Shortkeys@Shortkeys.com";
sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c"; url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi";
meta = with lib; sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c";
{ meta = with lib;
description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys"; {
mozPermissions = [ description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys";
"tabs" mozPermissions = [
"downloads" "tabs"
"clipboardWrite" "downloads"
"browsingData" "clipboardWrite"
"storage" "browsingData"
"bookmarks" "storage"
"sessions" "bookmarks"
"<all_urls>" "sessions"
]; "<all_urls>"
platforms = platforms.all; ];
}; platforms = platforms.all;
}) };
]; })
];
};
settings = settings =
{ {
@ -4544,6 +4546,7 @@ This section is for setting things that should be used on hosts that are using t
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"jitsi-meet-1.0.8043" "jitsi-meet-1.0.8043"
"electron-29.4.6" "electron-29.4.6"
"SDL_ttf-2.0.11"
]; ];
} }
@ -4954,12 +4957,6 @@ Enable OpenGL, Sound, Bluetooth and various drivers.
keyboard.qmk.enable = true; keyboard.qmk.enable = true;
pulseaudio = {
enable = lib.mkIf (!config.services.pipewire.enable) true;
package = pkgs.pulseaudioFull;
};
enableAllFirmware = true; enableAllFirmware = true;
bluetooth = lib.mkIf config.swarselsystems.hasBluetooth { bluetooth = lib.mkIf config.swarselsystems.hasBluetooth {
@ -4978,6 +4975,21 @@ Enable OpenGL, Sound, Bluetooth and various drivers.
} }
#+end_src #+end_src
**** Pulseaudio
This is only used on systems not running Pipewire.
#+begin_src nix :tangle profiles/nixos/common/pulseaudio.nix
{ config, pkgs, lib, ... }: {
services.pulseaudio = {
enable = lib.mkIf (!config.services.pipewire.enable) true;
package = pkgs.pulseaudioFull;
};
}
#+end_src
**** Pipewire **** Pipewire
:PROPERTIES: :PROPERTIES:
:CUSTOM_ID: h:aa433f5e-a455-4414-b76b-0a2692fa06aa :CUSTOM_ID: h:aa433f5e-a455-4414-b76b-0a2692fa06aa
@ -8326,6 +8338,8 @@ Again, we adapt =nix= to our needs, enable the home-manager command for non-NixO
}; };
}; };
nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null);
programs.home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true; programs.home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true;
home = { home = {
@ -8498,7 +8512,7 @@ This holds packages that I can use as provided, or with small modifications (as
# the following packages are used (in some way) by waybar # the following packages are used (in some way) by waybar
playerctl playerctl
pavucontrol pavucontrol
pamixer stable.pamixer
# gnome.gnome-clocks # gnome.gnome-clocks
# wlogout # wlogout
# jdiskreport # jdiskreport
@ -10291,49 +10305,57 @@ I used to build the firefox addon =bypass-paywalls-clean= myself here, but the m
id = 0; id = 0;
isDefault = true; isDefault = true;
userChrome = builtins.readFile (self + /programs/firefox/chrome/userChrome.css); userChrome = builtins.readFile (self + /programs/firefox/chrome/userChrome.css);
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ extensions = {
tridactyl packages = with pkgs.nur.repos.rycee.firefox-addons; [
tampermonkey tridactyl
sidebery tampermonkey
browserpass sidebery
clearurls browserpass
darkreader clearurls
enhancer-for-youtube darkreader
istilldontcareaboutcookies enhancer-for-youtube
translate-web-pages istilldontcareaboutcookies
ublock-origin translate-web-pages
reddit-enhancement-suite ublock-origin
sponsorblock reddit-enhancement-suite
web-archives sponsorblock
single-file web-archives
widegithub single-file
enhanced-github widegithub
unpaywall enhanced-github
don-t-fuck-with-paste unpaywall
plasma-integration don-t-fuck-with-paste
(buildFirefoxXpiAddon { plasma-integration
pname = "shortkeys";
version = "4.0.2"; # configure the default the same as trusted in order not to be annoyed
addonId = "Shortkeys@Shortkeys.com"; noscript
url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi";
sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c"; # configure a shortcut 'ctrl+shift+c' with behaviour 'do nothing' in order to disable the dev console shortcut
meta = with lib; (buildFirefoxXpiAddon {
{ pname = "shortkeys";
description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys"; version = "4.0.2";
mozPermissions = [ addonId = "Shortkeys@Shortkeys.com";
"tabs" url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi";
"downloads" sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c";
"clipboardWrite" meta = with lib;
"browsingData" {
"storage" description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys";
"bookmarks" mozPermissions = [
"sessions" "tabs"
"<all_urls>" "downloads"
]; "clipboardWrite"
platforms = platforms.all; "browsingData"
}; "storage"
}) "bookmarks"
]; "sessions"
"<all_urls>"
];
platforms = platforms.all;
};
})
];
};
settings = { settings = {
"extensions.autoDisableScopes" = 0; "extensions.autoDisableScopes" = 0;

454
flake.lock generated
View file

@ -37,11 +37,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725860795, "lastModified": 1736852337,
"narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,16 +53,17 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731949548, "lastModified": 1732806396,
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github" "type": "github"
} }
}, },
@ -83,11 +84,11 @@
}, },
"crane_2": { "crane_2": {
"locked": { "locked": {
"lastModified": 1734808813, "lastModified": 1739053031,
"narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735468753, "lastModified": 1739841949,
"narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +146,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1735635676, "lastModified": 1740302110,
"narHash": "sha256-mr3Slf2LDg6YMjQcrNdj/i8tQK4p7NIYVshVPBgtYBM=", "narHash": "sha256-rQY2wY+KTGIH2oZFyqdsODjqmOJqyn+0BNURADQHi/s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "7dc139dffc4ad8301c639210a00d993e1c158069", "rev": "920cd4e86af18bd67a60013d80a79ff2cd7a176b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -158,14 +159,30 @@
"type": "github" "type": "github"
} }
}, },
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1739223196,
"narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
"type": "github"
},
"original": {
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1733328505,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,11 +257,11 @@
"flake-compat_6": { "flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1733328505,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,27 +329,31 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": { "flake-parts_4": {
"inputs": { "inputs": {
"systems": "systems" "nixpkgs-lib": [
"stylix",
"nur",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1733312601,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
@ -348,7 +369,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -363,7 +384,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": [ "systems": [
"stylix", "stylix",
@ -384,9 +405,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -426,11 +447,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724704488, "lastModified": 1738441377,
"narHash": "sha256-QmAanotjk81zsCwHI52XS4u9Cjv6KjNzTkYsAYFrubM=", "narHash": "sha256-5+CDb9ed+nV81aPPPuco1shoIPGolzfFEhaKDbYA4js=",
"owner": "TamtamHero", "owner": "TamtamHero",
"repo": "fw-fanctrl", "repo": "fw-fanctrl",
"rev": "db96c5962cff24f4c5977e30ca1c7626fb4171c7", "rev": "c7943533476994ab43fcf54496490cba20320131",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -440,6 +461,32 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"stylix",
"flake-compat"
],
"gitignore": "gitignore_4",
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1735882644,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -505,6 +552,28 @@
"type": "github" "type": "github"
} }
}, },
"gitignore_4": {
"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": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -529,11 +598,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735381016, "lastModified": 1740318342,
"narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -571,11 +640,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733085484, "lastModified": 1737630279,
"narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +655,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1734945620, "lastModified": 1737831083,
"narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -609,11 +678,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1734994463, "lastModified": 1739186342,
"narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -625,17 +694,15 @@
"nix-alien": { "nix-alien": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils",
"nix-filter": "nix-filter",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1734239219, "lastModified": 1740094523,
"narHash": "sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA=", "narHash": "sha256-vGxTGexcKN8BVunczdqps1dbu0khOFp0++Gvip9QZJ8=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15", "rev": "ab175cdbbad2a93afc86125eb0835694b005b2fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -651,11 +718,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735478292, "lastModified": 1739933872,
"narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -664,21 +731,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-formatter-pack": { "nix-formatter-pack": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -710,11 +762,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734234111, "lastModified": 1739071773,
"narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -730,11 +782,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735443188, "lastModified": 1740281615,
"narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -790,16 +842,16 @@
"nix-topology": { "nix-topology": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1734639503, "lastModified": 1738246091,
"narHash": "sha256-Z58HeNQpfbi94Cw8VxdF1GtU1S5AoWO0hfJTxA6wu78=", "narHash": "sha256-2+KkZsRO+XlOFbXbRgMZbRtlqn5MBNYj4HNmZ/2Tojg=",
"owner": "oddlama", "owner": "oddlama",
"repo": "nix-topology", "repo": "nix-topology",
"rev": "d6edd49bac68dc70e19b5e91617b9f04e8ac1c43", "rev": "5526269fa3eedf4f4bc00c0bf7a03db31d24b029",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -810,7 +862,7 @@
}, },
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
@ -829,11 +881,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1734829460, "lastModified": 1736643958,
"narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -850,11 +902,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734915500, "lastModified": 1737057290,
"narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -865,11 +917,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1735388221, "lastModified": 1740089251,
"narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -941,11 +993,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1735531152, "lastModified": 1740162160,
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -973,27 +1025,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1735286948, "lastModified": 1735563628,
"narHash": "sha256-JMRV2RI58nV1UqLXqm+lcea1/dr92fYjWU5S+Rz3fmE=", "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "31ac92f9628682b294026f0860e14587a09ffb4b", "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1005,11 +1041,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1734435836, "lastModified": 1739138025,
"narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4989a246d7a390a859852baddb1013f825435cee", "rev": "b2243f41e860ac85c0b446eadc6930359b294e79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1021,11 +1057,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733940404, "lastModified": 1739446958,
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1068,11 +1104,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1740367490,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1100,11 +1136,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1740126099,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "32fb99ba93fea2798be0e997ea331dd78167f814",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1132,16 +1168,16 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1732238832, "lastModified": 1736798957,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1226,11 +1262,34 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1735638324, "lastModified": 1740324936,
"narHash": "sha256-S5xXvBt8qZF6WsRiMMM4yfopZXqVYbT6xlaDb7+YMQQ=", "narHash": "sha256-kzhWrl9IU6ZJDbjrjpUGklLlitLUwOWsYTdkDSmAZZs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c639a0750ca212216bb10f2a9d7e9688e01ee54a", "rev": "c459157201e0a37dbf123256065be3f9a06508b0",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"nur_2": {
"inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": [
"stylix",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1739903703,
"narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=",
"owner": "nix-community",
"repo": "NUR",
"rev": "2215ad5c4347f522523715e809f5f2022509f504",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1299,15 +1358,14 @@
"gitignore": "gitignore_3", "gitignore": "gitignore_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1734797603, "lastModified": 1737465171,
"narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1340,7 +1398,7 @@
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",
"systems": "systems_4", "systems": "systems_3",
"zjstatus": "zjstatus" "zjstatus": "zjstatus"
} }
}, },
@ -1373,11 +1431,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734834660, "lastModified": 1739240901,
"narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=", "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b070e6030118680977bc2388868c4b3963872134", "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1407,11 +1465,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1735468296, "lastModified": 1739262228,
"narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1426,22 +1484,27 @@
"base16-fish": "base16-fish", "base16-fish": "base16-fish",
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_9",
"systems": "systems_3", "nur": "nur_2",
"systems": "systems_2",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux" "tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1735524788, "lastModified": 1740241659,
"narHash": "sha256-R4i8VCdSGLWHt6cL5p2Cmlh9MRodZsYO8moUjvxYb54=", "narHash": "sha256-2CXyPERfW6rm9R7nV73orfEsuqMlP/LoAfMUBK4s2jE=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a4ed4168fb83289374f24cb8a039c6983637a076", "rev": "3a686a20b8f4dc026e561c1c5a85671c8cfeeb4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1481,21 +1544,6 @@
} }
}, },
"systems_3": { "systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -1510,7 +1558,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": { "systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1559,14 +1607,30 @@
"type": "github" "type": "github"
} }
}, },
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1737565458,
"narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "schemes",
"type": "github"
}
},
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729501581, "lastModified": 1735737224,
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1575,6 +1639,22 @@
"type": "github" "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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1596,19 +1676,41 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"zjstatus": { "zjstatus": {
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane_2",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_10",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1735124047, "lastModified": 1739984347,
"narHash": "sha256-yp+H5xPUH1/NXXu9fIXHK1pJpDLvx75KfzUJP5g+al8=", "narHash": "sha256-uVCct8KcApApcl2dV6UQ/T5AjUAzk0DtyWjsVNZmvxo=",
"owner": "dj95", "owner": "dj95",
"repo": "zjstatus", "repo": "zjstatus",
"rev": "6eb5fb0dd16827d87a7c9b7b0f753caf56434d51", "rev": "378ea2602f374fa23f09b8a41648b0f2338cbe9b",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
hosts/nixos/nbl-imba-2/default.nix
View file

@ -44,15 +44,15 @@ in
resumeDevice = "/dev/disk/by-label/nixos"; resumeDevice = "/dev/disk/by-label/nixos";
}; };
# hardware = { hardware = {
# amdgpu = { amdgpu = {
# opencl.enable = true; opencl.enable = true;
# amdvlk = { amdvlk = {
# enable = true; enable = true;
# support32Bit.enable = true; support32Bit.enable = true;
# }; };
# }; };
# }; };
programs.fw-fanctrl.enable = true; programs.fw-fanctrl.enable = true;

90
modules/home/firefox.nix
View file

@ -15,50 +15,52 @@ in
default = { default = {
isDefault = false; isDefault = false;
userChrome = builtins.readFile "${self}/programs/firefox/chrome/userChrome.css"; userChrome = builtins.readFile "${self}/programs/firefox/chrome/userChrome.css";
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ extensions = {
tridactyl packages = with pkgs.nur.repos.rycee.firefox-addons; [
tampermonkey tridactyl
sidebery tampermonkey
browserpass sidebery
clearurls browserpass
darkreader clearurls
enhancer-for-youtube darkreader
istilldontcareaboutcookies enhancer-for-youtube
translate-web-pages istilldontcareaboutcookies
ublock-origin translate-web-pages
reddit-enhancement-suite ublock-origin
sponsorblock reddit-enhancement-suite
web-archives sponsorblock
onepassword-password-manager web-archives
single-file onepassword-password-manager
widegithub single-file
enhanced-github widegithub
unpaywall enhanced-github
don-t-fuck-with-paste unpaywall
plasma-integration don-t-fuck-with-paste
(buildFirefoxXpiAddon { plasma-integration
pname = "shortkeys"; (buildFirefoxXpiAddon {
version = "4.0.2"; pname = "shortkeys";
addonId = "Shortkeys@Shortkeys.com"; version = "4.0.2";
url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi"; addonId = "Shortkeys@Shortkeys.com";
sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c"; url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi";
meta = with lib; sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c";
{ meta = with lib;
description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys"; {
mozPermissions = [ description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys";
"tabs" mozPermissions = [
"downloads" "tabs"
"clipboardWrite" "downloads"
"browsingData" "clipboardWrite"
"storage" "browsingData"
"bookmarks" "storage"
"sessions" "bookmarks"
"<all_urls>" "sessions"
]; "<all_urls>"
platforms = platforms.all; ];
}; platforms = platforms.all;
}) };
]; })
];
};
settings = settings =
{ {

94
profiles/home/common/firefox.nix
View file

@ -146,49 +146,57 @@ in
id = 0; id = 0;
isDefault = true; isDefault = true;
userChrome = builtins.readFile (self + /programs/firefox/chrome/userChrome.css); userChrome = builtins.readFile (self + /programs/firefox/chrome/userChrome.css);
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ extensions = {
tridactyl packages = with pkgs.nur.repos.rycee.firefox-addons; [
tampermonkey tridactyl
sidebery tampermonkey
browserpass sidebery
clearurls browserpass
darkreader clearurls
enhancer-for-youtube darkreader
istilldontcareaboutcookies enhancer-for-youtube
translate-web-pages istilldontcareaboutcookies
ublock-origin translate-web-pages
reddit-enhancement-suite ublock-origin
sponsorblock reddit-enhancement-suite
web-archives sponsorblock
single-file web-archives
widegithub single-file
enhanced-github widegithub
unpaywall enhanced-github
don-t-fuck-with-paste unpaywall
plasma-integration don-t-fuck-with-paste
(buildFirefoxXpiAddon { plasma-integration
pname = "shortkeys";
version = "4.0.2"; # configure the default the same as trusted in order not to be annoyed
addonId = "Shortkeys@Shortkeys.com"; noscript
url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi";
sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c"; # configure a shortcut 'ctrl+shift+c' with behaviour 'do nothing' in order to disable the dev console shortcut
meta = with lib; (buildFirefoxXpiAddon {
{ pname = "shortkeys";
description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys"; version = "4.0.2";
mozPermissions = [ addonId = "Shortkeys@Shortkeys.com";
"tabs" url = "https://addons.mozilla.org/firefox/downloads/file/3673761/shortkeys-4.0.2.xpi";
"downloads" sha256 = "c6fe12efdd7a871787ac4526eea79ecc1acda8a99724aa2a2a55c88a9acf467c";
"clipboardWrite" meta = with lib;
"browsingData" {
"storage" description = "Easily customizable custom keyboard shortcuts for Firefox. To configure this addon go to Addons (ctrl+shift+a) ->Shortkeys ->Options. Report issues here (please specify that the issue is found in Firefox): https://github.com/mikecrittenden/shortkeys";
"bookmarks" mozPermissions = [
"sessions" "tabs"
"<all_urls>" "downloads"
]; "clipboardWrite"
platforms = platforms.all; "browsingData"
}; "storage"
}) "bookmarks"
]; "sessions"
"<all_urls>"
];
platforms = platforms.all;
};
})
];
};
settings = { settings = {
"extensions.autoDisableScopes" = 0; "extensions.autoDisableScopes" = 0;

2
profiles/home/common/settings.nix
View file

@ -23,6 +23,8 @@
}; };
}; };
nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null);
programs.home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true; programs.home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true;
home = { home = {

1
profiles/nixos/common/default.nix
View file

@ -8,6 +8,7 @@ in
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"jitsi-meet-1.0.8043" "jitsi-meet-1.0.8043"
"electron-29.4.6" "electron-29.4.6"
"SDL_ttf-2.0.11"
]; ];
} }

6
profiles/nixos/common/hardware.nix
View file

@ -16,12 +16,6 @@
keyboard.qmk.enable = true; keyboard.qmk.enable = true;
pulseaudio = {
enable = lib.mkIf (!config.services.pipewire.enable) true;
package = pkgs.pulseaudioFull;
};
enableAllFirmware = true; enableAllFirmware = true;
bluetooth = lib.mkIf config.swarselsystems.hasBluetooth { bluetooth = lib.mkIf config.swarselsystems.hasBluetooth {

8
profiles/nixos/common/pulseaudio.nix Normal file
View file

@ -0,0 +1,8 @@
{ config, pkgs, lib, ... }: {
services.pulseaudio = {
enable = lib.mkIf (!config.services.pipewire.enable) true;
package = pkgs.pulseaudioFull;
};
}