Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

Compare commits

base: Daholli:59e1ab3c3d0db0806f49718bb7d21eff7f0590bc
Branches Tags
Daholli:main
Daholli:develop
Daholli:matrix-server
..
compare: Daholli:479dad5cb42962bfdfff6f4273cd64d575ff292d
Branches Tags
Daholli:develop
Daholli:matrix-server
Daholli:main

No commits in common. "59e1ab3c3d0db0806f49718bb7d21eff7f0590bc" and "479dad5cb42962bfdfff6f4273cd64d575ff292d" have entirely different histories.
59e1ab3c3d ... 479dad5cb4

8 changed files with 13 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

78
flake.lock generated
View file

@ -255,26 +255,6 @@
"type": "github" "type": "github"
} }
}, },
"danksearch": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1775400666,
"narHash": "sha256-R0Eh0KeaclBb5tIs8hQg6+DjqENn7SBlZkJKZCt3NYg=",
"owner": "AvengeMedia",
"repo": "danksearch",
"rev": "53663c86805edd79c9c17fa0adf14f54b8edfc24",
"type": "github"
},
"original": {
"owner": "AvengeMedia",
"repo": "danksearch",
"type": "github"
}
},
"devenv": { "devenv": {
"inputs": { "inputs": {
"cachix": "cachix", "cachix": "cachix",
@ -659,24 +639,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -2504,7 +2466,6 @@
"inputs": { "inputs": {
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"dankMaterialShell": "dankMaterialShell", "dankMaterialShell": "dankMaterialShell",
"danksearch": "danksearch",
"devenv": "devenv", "devenv": "devenv",
"dgop": "dgop", "dgop": "dgop",
"disko": "disko", "disko": "disko",
@ -2539,7 +2500,6 @@
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_3", "systems": "systems_3",
"titrack": "titrack",
"treefmt-nix": "treefmt-nix_3", "treefmt-nix": "treefmt-nix_3",
"zen-browser": "zen-browser", "zen-browser": "zen-browser",
"zig-overlay": "zig-overlay", "zig-overlay": "zig-overlay",
@ -2673,21 +2633,6 @@
} }
}, },
"systems_4": { "systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -2703,27 +2648,6 @@
"type": "github" "type": "github"
} }
}, },
"titrack": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1776569300,
"narHash": "sha256-LzXfD81tc/wOvyG0ODLfivSJ6dBo4q8MyfOi69E129U=",
"owner": "Daholli",
"repo": "TiTrack",
"rev": "1ff3100c4f35032b147069123e1fac98a2b220b4",
"type": "github"
},
"original": {
"owner": "Daholli",
"repo": "TiTrack",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -2905,7 +2829,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1776646674, "lastModified": 1776646674,

10
flake.nix
View file

@ -65,11 +65,6 @@
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
titrack = {
url = "github:Daholli/TiTrack";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
### ###
# hyprland stuff # hyprland stuff
hyprland = { hyprland = {
@ -106,11 +101,6 @@
}; };
}; };
danksearch = {
url = "github:AvengeMedia/danksearch";
inputs.nixpkgs.follows = "nixpkgs";
};
dgop = { dgop = {
url = "github:AvengeMedia/dgop"; url = "github:AvengeMedia/dgop";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";

3
modules/desktop/addons/dms/default.nix
View file

@ -11,7 +11,6 @@
imports = [ imports = [
inputs.dankMaterialShell.homeModules.dank-material-shell inputs.dankMaterialShell.homeModules.dank-material-shell
inputs.dankMaterialShell.homeModules.niri inputs.dankMaterialShell.homeModules.niri
inputs.danksearch.homeModules.dsearch
]; ];
config = lib.mkIf osConfig.programs.niri.enable { config = lib.mkIf osConfig.programs.niri.enable {
@ -41,8 +40,6 @@
enableAudioWavelength = false; enableAudioWavelength = false;
enableCalendarEvents = false; enableCalendarEvents = false;
}; };
programs.dsearch.enable = true;
}; };
}; };
} }

2
modules/desktop/addons/dms/settings.json
View file

@ -214,7 +214,7 @@
"greeterRememberLastUser": true, "greeterRememberLastUser": true,
"greeterEnableFprint": false, "greeterEnableFprint": false,
"greeterEnableU2f": false, "greeterEnableU2f": false,
"greeterWallpaperPath": "/home/cholli/Pictures/horizon-zero-dawn-aloy.jpg", "greeterWallpaperPath": "",
"greeterUse24HourClock": true, "greeterUse24HourClock": true,
"greeterShowSeconds": false, "greeterShowSeconds": false,
"greeterPadHours12Hour": false, "greeterPadHours12Hour": false,

33
modules/desktop/default.nix
View file

@ -13,25 +13,22 @@
in in
{ {
security.pam.services.gdm.enableGnomeKeyring = true;
services.displayManager.gdm = {
enable = true;
wayland = true;
};
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
zenbrowser zenbrowser
sourcegit sourcegit
(pkgs.catppuccin-kvantum.override {
accent = "lavender";
variant = "mocha";
})
pkgs.adwaita-icon-theme
]; ];
sessionVariables = { sessionVariables = {
DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta"; DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta";
BROWSER = "zen-beta"; BROWSER = "zen-beta";
QT_QPA_PLATFORMTHEME = "kvantum";
QS_ICON_THEME = "adwaita";
}; };
etc = lib.mkIf config.programs._1password.enable { etc = lib.mkIf config.programs._1password.enable {
@ -60,19 +57,11 @@
# }; # };
# }; # };
qt = { # qt = {
enable = true; # enable = true;
platformTheme = "qtct"; # platformTheme.name = "gnome";
style = { # style.name = "adwaita-dark";
package = ( # };
pkgs.catppuccin-kvantum.override {
accent = "lavender";
variant = "mocha";
}
);
name = "kvantum";
};
};
systemd.user.sessionVariables = osConfig.home-manager.users.cholli.home.sessionVariables; systemd.user.sessionVariables = osConfig.home-manager.users.cholli.home.sessionVariables;

21
modules/desktop/niri.nix
View file

@ -3,32 +3,11 @@
nixos.niri = nixos.niri =
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [
inputs.dankMaterialShell.nixosModules.greeter
];
programs.niri = { programs.niri = {
enable = true; enable = true;
package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable; package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable;
}; };
programs.dank-material-shell = {
greeter = {
enable = true;
compositor.name = "niri";
configHome = "/home/cholli";
};
};
security = {
pam = {
services.greetd.enableGnomeKeyring = true;
};
};
services.accounts-daemon.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kitty kitty

8
modules/games/various-games.nix
View file

@ -2,10 +2,6 @@
flake.modules.nixos.games = flake.modules.nixos.games =
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [
inputs.titrack.nixosModules.default
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
prismlauncher prismlauncher
starsector starsector
@ -14,9 +10,5 @@
pyfa pyfa
inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rusty-path-of-building inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rusty-path-of-building
]; ];
services.titrack = {
enable = true;
};
}; };
} }

10
modules/users/cholli/default.nix
View file

@ -58,8 +58,6 @@ topLevel: {
"networkmanager" "networkmanager"
"sound" "sound"
"tty" "tty"
"usb"
"systemd-journal"
"wheel" "wheel"
]; ];
shell = pkgs.fish; shell = pkgs.fish;
@ -70,14 +68,6 @@ topLevel: {
nix.settings.trusted-users = [ topLevel.config.flake.meta.users.cholli.username ]; nix.settings.trusted-users = [ topLevel.config.flake.meta.users.cholli.username ];
systemd.tmpfiles.rules =
let
username = "cholli";
in
[
"f+ /var/lib/AccountsService/users/${username} 0600 root root - [User]\\nIcon=/var/lib/AccountsService/icons/${username}\\n" # notice the "\\n" we don't want nix to insert a new line in our string, just pass it as \n to systemd
"L+ /var/lib/AccountsService/icons/${username} - - - - ${./profile.png}"
];
}; };
homeManager.cholli = homeManager.cholli =