Compare commits

..

No commits in common. "5c0274e681c3950b50e212dc2e6aafbf91c1e3d2" and "9a1f243b499a30e35750dc4a44b15e074833a88c" have entirely different histories.

8 changed files with 21 additions and 59 deletions

37
flake.lock generated
View file

@ -152,22 +152,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1733759999,
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
@ -176,8 +160,7 @@
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"snowfall-lib": "snowfall-lib", "snowfall-lib": "snowfall-lib",
"sops-nix": "sops-nix", "sops-nix": "sops-nix"
"zen-browser": "zen-browser"
} }
}, },
"snowfall-lib": { "snowfall-lib": {
@ -237,24 +220,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"zen-browser": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1734038753,
"narHash": "sha256-v2NetNrFvObcTx5Gw0MV9leJQr0KfCLtbpC4gZaq+Tc=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "b2a4aeaad1cdb4a0d8901313d6388a8b4bf2c59d",
"type": "github"
},
"original": {
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -37,10 +37,6 @@
nix-flatpak = { nix-flatpak = {
url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
}; };
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
};
}; };
outputs = inputs: outputs = inputs:

View file

@ -17,8 +17,8 @@
"org/gnome/shell" = { "org/gnome/shell" = {
favorite-apps = [ favorite-apps = [
"org.gnome.Nautilus.desktop" "org.gnome.Nautilus.desktop"
"obsidian.desktop" "chromium-browser.desktop"
"zen.desktop" "spotify.desktop"
"phpstorm.desktop" "phpstorm.desktop"
]; ];

View file

@ -12,10 +12,6 @@
themes.catppuccin.gtk.enable = true; themes.catppuccin.gtk.enable = true;
home.file."~/.config/Yubico/u2f_keys".text = ''
jo:gtKwCQKVw5O4IkWg8J8o7vHIo3hStmOqVcnmk97E335DwHnPUMIDTMnD46qEn/1tucTZlYfGABfzVVG+iYeUOA==,fVRFZb9iBiqjOXvk5Gm9ygO/O4huEUR1Uq3DGBlnS1RtqqK0shif8aOlNLkmn8Xe9+x4HYIeNEX4fc8Z7Y2Hgw==,es256,+presence
'';
# Flatpak configuration. # Flatpak configuration.
services.flatpak = { services.flatpak = {
enable = true; enable = true;
@ -48,7 +44,6 @@
python39 python39
nil nil
zed-editor zed-editor
bruno
### Rust development specific ### Rust development specific
rustup rustup

View file

@ -10,8 +10,8 @@ let
css = pkgs.writeTextFile { css = pkgs.writeTextFile {
name = "gtk-css"; name = "gtk-css";
text = '' text = ''
@define-color accent_color ${config.palette.maroon.hex}; @define-color accent_color ${config.palette.blue.hex};
@define-color accent_bg_color ${config.palette.maroon.hex}; @define-color accent_bg_color ${config.palette.blue.hex};
@define-color accent_fg_color ${config.palette.base.hex}; @define-color accent_fg_color ${config.palette.base.hex};
@define-color destructive_color ${config.palette.red.hex}; @define-color destructive_color ${config.palette.red.hex};
@define-color destructive_bg_color ${config.palette.red.hex}; @define-color destructive_bg_color ${config.palette.red.hex};
@ -128,8 +128,8 @@ in
catppuccin = { catppuccin = {
icon = { icon = {
enable = true; enable = true;
accent = "maroon"; accent = "blue";
flavor = "mocha"; flavor = "macchiato";
}; };
}; };
@ -156,8 +156,8 @@ in
}; };
"org/gnome/desktop/background" = { "org/gnome/desktop/background" = {
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/mocha-vibrant-colours.png"; picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/mocha-vibrant-colours.png"; picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
}; };
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {

View file

@ -21,7 +21,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ yubikey-manager yubioath-flutter ]; environment.systemPackages = with pkgs; [ yubikey-manager yubioath-flutter ];
services.udev.packages = [ pkgs.yubikey-personalization ]; services.udev.packages = [ pkgs.yubikey-personalization ];
services.pcscd.enable = true; services.pcscd.enable = true;
@ -30,9 +30,11 @@ in
enableSSHSupport = true; enableSSHSupport = true;
}; };
security.pam.services = { security.pam.yubico = {
login.u2fAuth = true; enable = true;
sudo.u2fAuth = true; debug = false;
mode = "challenge-response";
id = cfg.key-id;
}; };
}; };
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 MiB

View file

@ -4,7 +4,6 @@
inputs, inputs,
namespace, namespace,
config, config,
system,
... ...
}: with lib; with lib.${namespace}; }: with lib; with lib.${namespace};
{ {
@ -73,12 +72,17 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
### General ### General
nano nano
inputs.zen-browser.packages."${system}".specific firefox
chromium
vlc vlc
spotify
## Security ## Security
pinentry-tty pinentry-tty
gnupg gnupg
## Development
arduino-ide
]; ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";