mikael/home
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Experiment

Browse source
This commit is contained in:
Mikael 2024-07-30 15:24:57 +02:00
parent 3ad92fadec
commit 710cdfc130
6 changed files with 64 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firefox.nix
View file

@ -4,7 +4,7 @@ let
owner = "MrOtherGuy";
repo = "firefox-csshacks";
rev = "467a53ee72e169a9cef54b8677738b71dffd1335";
sparseCheckOut = [ "!/*" "/chrome" "/content" ];
sparseCheckout = [ "!/*" "/chrome" "/content" ];
hash = lib.fakeHash;
};
in lib.mkIf osConfig.hardware.graphics.enable {

31
flake.lock
View file

@ -115,11 +115,14 @@
}
},
"en_EU": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722342253,
"narHash": "sha256-M0Qoy7bUEPW+M+j9U123cKcYoq/lYp+55O4ckdp8F5o=",
"lastModified": 1722354766,
"narHash": "sha256-eKlTozf7vrmsNGwNFWOn+epavcvCyRqK94ZgV9vKe1A=",
"ref": "refs/heads/main",
"rev": "c8cdb3138fbd6f5a86caaca518007a820605f24e",
"rev": "733ceccbfc70345610573334612e6589688d4f5d",
"revCount": 5,
"type": "git",
"url": "https://woof.rip/mikael/en_EU.git"
@ -219,6 +222,20 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1722141560,
"narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1722141560,
"narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
@ -236,11 +253,11 @@
},
"nur": {
"locked": {
"lastModified": 1722339893,
"narHash": "sha256-/ADfwg4ougEg5I84qR9rce1bmOEMa7vgbpb5+fxuqKU=",
"lastModified": 1722350417,
"narHash": "sha256-1MNpE3S9W7F1+2wg1WonX1+55c4j0WKFRPYq8JD7WxU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "98be6f7d1266a53ed64992e14b260a8393b7f1ba",
"rev": "51808228e58e636d4b59228ed3881f7f971e7bf1",
"type": "github"
},
"original": {
@ -254,7 +271,7 @@
"en_EU": "en_EU",
"home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nur": "nur",
"stylix": "stylix"
}

4
flake.nix
View file

@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nur.url = "github:nix-community/NUR";
home-manager = {
@ -24,6 +24,6 @@
outputs = { self, ... }@inputs: {
nixosModules.default = import ./module.nix inputs;
hmModules.default = import ./home.nix inputs;
homeConfigurations.default = import ./home.nix inputs;
};
}

13
home.nix
View file

@ -1,15 +1,18 @@
inputs: { config, lib, pkgs, osConfig, ... }: {
imports = [
inputs.nur.hmModules.nur
inputs.en_EU.hmModules.default
inputs.en_EU.homeModules.default
inputs.nix-index-database.hmModules.nix-index
inputs.stylix.homeManagerModules.stylix
./firefox.nix
./wayland.nix
];
home.stateVersion = "24.11";
home.activation = {
fish = inputs.home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
fish = lib.hm.dag.entryAfter ["writeBoundary"] ''
run ${lib.getExe config.programs.fish.package} -c 'set -U fish_greeting'
'';
};
@ -170,7 +173,7 @@ inputs: { config, lib, pkgs, osConfig, ... }: {
};
programs.gpg = {
enable = config.hardware.gpgSmartcards.enable;
enable = osConfig.hardware.gpgSmartcards.enable;
scdaemonSettings.disable-ccid = true;
};
@ -300,10 +303,10 @@ inputs: { config, lib, pkgs, osConfig, ... }: {
};
services.gpg-agent = {
enable = config.hardware.gpgSmartcards.enable;
enable = osConfig.hardware.gpgSmartcards.enable;
enableSshSupport = true;
pinentryPackage =
if config.hardware.graphics.enable
if osConfig.hardware.graphics.enable
then pkgs.pinentry-gtk2
else pkgs.pinentry-curses;
};

10
module.nix
View file

@ -1,4 +1,4 @@
inputs: { config, lib, pkgs, ... }: user: {
inputs: user: { config, lib, pkgs, ... }: {
imports = [ inputs.home-manager.nixosModules.home-manager ];
environment.etc."xkb/symbols/greedy" =
@ -6,9 +6,11 @@ inputs: { config, lib, pkgs, ... }: user: {
source = ./greedy.xkb;
};
home-manager.useUserPackages = lib.mkDefault true;
home-manager.useGlobalPkgs = lib.mkDefault true;
home-manager.users.${user} = inputs.self.hmModule.default;
home-manager = {
useUserPackages = lib.mkDefault true;
useGlobalPkgs = lib.mkDefault true;
users.${user} = inputs.self.homeConfigurations.default;
};
programs.fish.enable = true;

28
wayland.nix
View file

@ -211,7 +211,7 @@ in lib.mkIf osConfig.hardware.graphics.enable {
};
programs.texlive = {
enable = config.hardware.graphics.enable;
enable = true;
extraPackages = tpkgs: {
inherit (tpkgs)
texlive-scripts
@ -243,13 +243,13 @@ in lib.mkIf osConfig.hardware.graphics.enable {
};
programs.thunderbird = {
enable = config.hardware.graphics.enable;
enable = true;
package = pkgs.thunderbird;
profiles = { };
};
programs.waybar = {
enable = config.hardware.graphics.enable;
enable = true;
systemd = {
enable = true;
target = "hyprland-session.target";
@ -315,7 +315,7 @@ in lib.mkIf osConfig.hardware.graphics.enable {
programs.yt-dlp.enable = true;
services.gammastep = {
enable = config.hardware.graphics.enable;
enable = true;
provider = "geoclue2";
settings = {
general.adjustment-method = "wayland";
@ -323,7 +323,7 @@ in lib.mkIf osConfig.hardware.graphics.enable {
};
services.hypridle = {
enable = config.hardware.graphics.enable;
enable = true;
settings = {
general = with cmd; {
lock_cmd = "${pidof} hyprlock || ${hyprlock}";
@ -408,6 +408,24 @@ in lib.mkIf osConfig.hardware.graphics.enable {
stylix = {
enable = true;
image = ./wallpaper.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml";
fonts = {
sansSerif = {
package = pkgs.lato;
name = "Lato";
};
monospace = {
package = pkgs.fira-code;
name = "Fira Code";
};
sizes.terminal = 11;
};
targets = {
hyprpaper.enable = lib.mkForce false;
};