This commit is contained in:
Glen Goodwin 2023-10-08 12:50:14 -04:00
parent 47ae69d5ca
commit 56ffc7220f
7 changed files with 169 additions and 14 deletions

108
flake.lock generated
View file

@ -1,5 +1,26 @@
{
"nodes": {
"banner": {
"inputs": {
"nixpkgs": [
"gtk-nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1669224926,
"narHash": "sha256-UK19yx8jNqbPfBZNUeJr2Sms7BhbDAUyJBF5w2CT6Hc=",
"owner": "the-argus",
"repo": "banner.nix",
"rev": "253556f4068f5cb9728e49ac42d630cdc0ccfd58",
"type": "github"
},
"original": {
"owner": "the-argus",
"repo": "banner.nix",
"type": "github"
}
},
"base16-schemes": {
"flake": false,
"locked": {
@ -74,6 +95,24 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -96,6 +135,26 @@
"type": "github"
}
},
"gtk-nix": {
"inputs": {
"banner": "banner",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1692384535,
"narHash": "sha256-lFOEsDLV7kuEAcHS7HfyGewTcdSkzTxM+l3XwGhzLgU=",
"owner": "the-argus",
"repo": "gtk-nix",
"rev": "e77b9e68aa818b87389c682b4fd018ad451a85d3",
"type": "github"
},
"original": {
"owner": "the-argus",
"repo": "gtk-nix",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -122,7 +181,7 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2",
"systems": "systems_3",
"wlroots": "wlroots",
"xdph": "xdph"
},
@ -246,18 +305,17 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1695830400,
"narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
"owner": "nixos",
"lastModified": 1692264070,
"narHash": "sha256-WepAkIL2UcHOj7JJiaFS/vxrA9lklQHv8p+xGL+7oQ0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
"rev": "42c25608aa2ad4e5d3716d8d63c606063513ba33",
"type": "github"
},
"original": {
"owner": "nixos",
"id": "nixpkgs",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "indirect"
}
},
"nixpkgs-lib": {
@ -323,6 +381,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1695830400,
"narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": [
@ -354,11 +428,12 @@
"root": {
"inputs": {
"devenv": "devenv",
"gtk-nix": "gtk-nix",
"home-manager": "home-manager",
"hyprland": "hyprland",
"nix-colors": "nix-colors",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
@ -378,6 +453,21 @@
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",

View file

@ -20,12 +20,13 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-colors.url = "github:misterio77/nix-colors";
gtk-nix.url = "github:the-argus/gtk-nix";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, home-manager, hyprland, devenv, ... }@inputs:
outputs = { self, nixpkgs, ... }@inputs:
let
system = "x86_64-linux";
@ -44,7 +45,7 @@
import ./hosts {
inherit (nixpkgs) lib;
specialArgs = { inherit inputs; };
inherit inputs user system home-manager hyprland devenv;
inherit inputs user system;
}
);
};

View file

@ -1,4 +1,4 @@
{ lib, inputs, system, home-manager, user, ... }:
{ lib, inputs, system, user, ... }:
{
@ -17,7 +17,7 @@
./configuration.nix
../modules/themes/home.nix
inputs.nix-index-database.nixosModules.nix-index
home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

View file

@ -13,6 +13,7 @@
[ (import ../modules/themes/home.nix) ] ++
[ (import ../modules/programs/mako.nix) ] ++
[ (import ../modules/programs/alacritty.nix) ] ++
[ (import ../modules/desktop/gtk.nix) ] ++
[ (import ../modules/shell/zsh/home.nix) ];
@ -101,7 +102,6 @@
gnome.file-roller # Archive Manager
okular # PDF Viewer
#pcmanfm # File Manager
xfce.thunar # File Manager
p7zip # Zip Encryption
rsync # Syncer - $ rsync -r dir1/ dir2/
unzip # Zip Files

View file

@ -11,6 +11,7 @@
[ (import ./auditd.nix) ] ++
[ (import ./openssh.nix) ] ++
[ (import ./apparmor.nix) ] ++
[ (import ../../modules/programs/thunar.nix) ] ++
[ (import ../../modules/desktop/hyprland/default.nix) ]; # Window Manager
hardware.sane = {

50
modules/desktop/gtk.nix Normal file
View file

@ -0,0 +1,50 @@
{ inputs
, pkgs
, ...
}: {
gtk = {
cursorTheme = {
name = "Catppuccin-Mocha-Dark-Cursors";
package = pkgs.catppuccin-cursors.mochaDark;
};
enable = true;
iconTheme = {
package = pkgs.catppuccin-papirus-folders.override {
flavor = "mocha";
accent = "blue";
};
name = "Papirus-Dark";
};
theme = {
package = pkgs.catppuccin-gtk.override {
size = "compact";
variant = "mocha";
};
name = "Catppuccin-Mocha-Compact-Blue-Dark";
};
};
}

View file

@ -0,0 +1,13 @@
{ pkgs, config, ... }:
{
programs.thunar = {
enable = true;
plugins = with pkgs.xfce; [
thunar-archive-plugin
thunar-volman
];
};
services.gvfs.enable = true; # Mount, trash, and other functionalities
services.tumbler.enable = true; # Thumbnail support for images
}