wayne/system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

General Cleanup

Browse Source
This commit is contained in:
wayne 2025-05-03 09:43:09 -07:00
parent f6455af01b
commit d7c041ccf4
4 changed files with 9 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
configuration.nix
View File

@ -9,7 +9,6 @@
agenix,
pkgs-unstable,
pia,
# ghostty,
...
}:
let
@ -22,7 +21,6 @@ in
./environment.nix
./hardware-configuration.nix
# (import ./modules/containers.nix { inherit pkgs inputs config lib pkgs-unstable ;})
./modules/containers.nix
./modules/display.nix
./modules/files.nix
@ -62,32 +60,14 @@ in
# };
# wantedBy = [ "multi-user.target" ];
# };
# systemd.services.logid = {
# description = "Logitech Configuration Daemon";
# startLimitIntervalSec = 0;
# after = [ "multi-user.target" ];
# wants = [ "multi-user.target" ];
# serviceConfig = {
# Type = "simple";
# ExecStart = "/run/current-system/sw/bin/logid";
# User = "root";
# };
# wantedBy = [ "multi-user.target" ];
# };
# Install firefox.
programs.firefox.enable = true;
programs.zsh.enable = true;
programs.nix-ld.enable = true;
programs.fuse.userAllowOther = true;
programs = {
firefox.enable = true;
zsh.enable = true;
nix-ld.enable = true;
fuse.userAllowOther = true;
};
# programs.nix-ld.libraries = with pkgs; [
# libusb
# kdePackages.qt5compat kdePackages.full
# libsForQt5.full
# libGL
# gcc glib xorg.libXext
# ];
services = {
blueman.enable = true;
@ -160,15 +140,6 @@ in
PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
};
};
# kmonad = {
# enable = true;
# keyboards = {
# myKMonadOutput = {
# device = "/dev/input/by-id/usb-Hanvon_Ugee_Shortcut_Remote_000000000000000-event-kbd";
# config = builtins.readFile /home/wayne/.config/kmonad/hanvon-ugee.kbd;
# };
# };
# };
avahi = { # Printing
enable = true;
nssmdns4 = true;
@ -235,9 +206,7 @@ in
flavor = "mocha";
font = "Noto Sans";
fontSize = "9";
# background = "${/home/wayne/Pictures/marvin.png}";
loginBackground = true;
# clockEnabled = true;
})
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget git sshfs

28
flake.nix
View File

@ -18,9 +18,6 @@
flake = false;
};
# nix-ld.url = "github:Mic92/nix-ld";
# nix-ld.inputs.nixpkgs.follows = "nixpkgs";
base16.url = "github:SenchoPens/base16.nix";
nix-colors.url = "github:misterio77/nix-colors";
tt-schemes = {
@ -33,30 +30,19 @@
};
# Zen Browser
# zen-browser.url = "github:ch4og/zen-browser-flake";
zen-browser.url = "github:youwen5/zen-browser-flake";
zen-browser.inputs.nixpkgs.follows = "nixpkgs";
# ghostty.url = "github:ghostty-org/ghostty";
# hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
# hyprland.url = "github:hyprwm/Hyprland";
# GnuCobal.url="/home/wayne/Flakes/derivations/GnuCobal/";
# kmonad = {
# url = "git+https://github.com/kmonad/kmonad?submodules=1&dir=nix";
# inputs.nixpkgs.follows = "nixpkgs";
# };
agenix.url = "github:ryantm/agenix";
# PIA
pia.url = "github:Fuwn/pia.nix";
pia.inputs.nixpkgs.follows = "nixpkgs";
musnix.url = "github:musnix/musnix";
# compose2nix.url = "github:aksiksi/compose2nix";
# compose2nix.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = {
@ -71,11 +57,8 @@
nix-colors,
base16,
agenix,
# nix-ld,
musnix,
pia,
# ghostty,
# compose2nix,
...
} @ inputs:
let
@ -117,24 +100,17 @@
launchpad = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs systemSettings userSettings lib agenix pia ;};
modules = [
# kmonad.nixosModules.default
musnix.nixosModules.musnix
agenix.nixosModules.default
pia.nixosModules."x86_64-linux".default
./configuration.nix
# nix-ld.nixosModules.nix-ld
# https://github.com/nix-community/nix-ld
# The module in this repository defines a new module under (programs.nix-ld.dev) instead of (programs.nix-ld)
# to not collide with the nixpkgs version.
# { programs.nix-ld.dev.enable = true; }
./configuration.nix
];
};
};
homeConfigurations = {
wayne = home-manager.lib.homeManagerConfiguration {
# pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs systemSettings userSettings zen-browser nix-colors ;};
modules = [

9
hm/home.nix
View File

@ -217,15 +217,6 @@ in
};
services = {
blueman-applet.enable = true;
# keybase.enable = true;
# kbfs = {
# enable = true;
# mountPoint = "keybase";
# extraFlags = [
# "-label: kbfs"
# "-mount-type: normal"
# ];
# };
nextcloud-client = {
enable = false;
startInBackground = false;

2
pkgs/wm/hyprland/hyprland.nix
View File

@ -247,7 +247,7 @@
"wl-paste --type text --watch cliphist store"
"wl-paste --type image --watch cliphist store"
# "${config.home.homeDirectory}/.config/hypr/scripts/start-in-tray.sh &"
"${config.home.homeDirectory}/.config/hypr/scripts/start-keybase-gui.sh &"
# "${config.home.homeDirectory}/.config/hypr/scripts/start-keybase-gui.sh &"
"input-remapper-control --command autoload &"
# "/nix/store/yvnjx0qis4qdajc52f4xswhz4g69lcbn-polkit-kde-agent-1-6.2.5/libexec/polkit-kde-authentication-agent-1"