janis/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: janis:96cd2ed76f9b86fdb691f723abd7d8c80b83afbc
Branches Tags
janis:main
janis:new-config
..
compare: janis:1196958b8f8712f04e4b8a45f8b2275f618e43e3
Branches Tags
janis:new-config
janis:main

No commits in common. "96cd2ed76f9b86fdb691f723abd7d8c80b83afbc" and "1196958b8f8712f04e4b8a45f8b2275f618e43e3" have entirely different histories.
96cd2ed76f ... 1196958b8f

13 changed files with 96 additions and 295 deletions
Show stats Expand all files Collapse all files

191
flake.lock
View file

@ -1,31 +1,5 @@
{ {
"nodes": { "nodes": {
"apple-fonts": {
"inputs": {
"nixpkgs": "nixpkgs",
"ny": "ny",
"sf-arabic": "sf-arabic",
"sf-armenian": "sf-armenian",
"sf-compact": "sf-compact",
"sf-georgian": "sf-georgian",
"sf-hebrew": "sf-hebrew",
"sf-mono": "sf-mono",
"sf-pro": "sf-pro"
},
"locked": {
"lastModified": 1752383772,
"narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=",
"owner": "Lyndeno",
"repo": "apple-fonts.nix",
"rev": "875c694d7f0ec2020d7511264907a1f0e3262931",
"type": "github"
},
"original": {
"owner": "Lyndeno",
"repo": "apple-fonts.nix",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -33,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756733629, "lastModified": 1753140376,
"narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +28,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1756832996, "lastModified": 1754068288,
"narHash": "sha256-pW+QqeXIIKzo4GkX+WM86t7vai++RHaDE32aMDAIUJs=", "narHash": "sha256-OWBCKYRqFD/WFcMGitxoT4QiTV/q4o4gosIH6vwTV+c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "73c17b083cd9383d9dd0c98ca33c5d7cdabfec6c", "rev": "a2c4e31c1f77ddc72342af1ab4f90847d46e1cc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +69,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756842514, "lastModified": 1754085240,
"narHash": "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=", "narHash": "sha256-kVHCrTWEe8B1thAhFag1bk4QPY0ZP45V9vPbrwPHoNo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "30fc1b532645a21e157b6e33e3f8b4c154f86382", "rev": "e102920c1becb114645c6f92fe14edc0b05cc229",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,16 +84,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1740828860, "lastModified": 1753749649,
"narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -142,11 +116,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1756542300, "lastModified": 1753939845,
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "rev": "94def634a20494ee057c76998843c015909d6311",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -158,27 +132,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1756754095, "lastModified": 1753939845,
"narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1756542300,
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "rev": "94def634a20494ee057c76998843c015909d6311",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,14 +149,14 @@
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1756856604, "lastModified": 1754092202,
"narHash": "sha256-7UTJ5JLQos2rWyxOqlNDzCkSRqhN7SAAvtdf8AHci7c=", "narHash": "sha256-GrmUYcws8Tos6Ubu018qFzAWVs4OpN5f+PgkVnLou7c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "143985f9f846656911cb35fdc3403a68a2363b87", "rev": "fa00a3de3b2ef6f1d6ee9f07dd4a31d6a5b91ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,112 +165,15 @@
"type": "github" "type": "github"
} }
}, },
"ny": {
"flake": false,
"locked": {
"narHash": "sha256-3257NAH4qlan2YHVLpNRy7x8IJqR2pal3OzFo/ykqXs=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
}
},
"root": { "root": {
"inputs": { "inputs": {
"apple-fonts": "apple-fonts",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur" "nur": "nur"
} }
},
"sf-arabic": {
"flake": false,
"locked": {
"narHash": "sha256-/0gjRimqvZyE60xYxxPdlU+7Q2LJnnvtbmwOP0YmS9U=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
}
},
"sf-armenian": {
"flake": false,
"locked": {
"narHash": "sha256-rRoDkbNMYkzOHZmQm96Zv80TZvRlAeoxkv4pMHP5nUg=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg"
}
},
"sf-compact": {
"flake": false,
"locked": {
"narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
}
},
"sf-georgian": {
"flake": false,
"locked": {
"narHash": "sha256-IevVNOC28IiR45YfI3PsZzXLMRxuB5u7UiE53Zn6tRU=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg"
}
},
"sf-hebrew": {
"flake": false,
"locked": {
"narHash": "sha256-Dw84kYwMpCtKKKqm8cZcQ9TZ7GayU5MO7W0LJw0Rcwk=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg"
}
},
"sf-mono": {
"flake": false,
"locked": {
"narHash": "sha256-ICdHRFdNL7PM/fXJUzS7LgZxZiqcyIuCMHLze4En4vg=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
}
},
"sf-pro": {
"flake": false,
"locked": {
"narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
}
} }
}, },
"root": "root", "root": "root",

6
flake.nix
View file

@ -15,10 +15,9 @@
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
}; };
outputs = inputs @ { self, disko, nixpkgs, nixpkgs-unstable, home-manager, apple-fonts, emacs-overlay, ... }: outputs = inputs @ { self, disko, nixpkgs, nixpkgs-unstable, home-manager, emacs-overlay, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
@ -73,9 +72,6 @@
laptop = mkSystem { laptop = mkSystem {
host = ./hosts/laptop; host = ./hosts/laptop;
}; };
desktop = mkSystem {
host = ./hosts/desktop;
};
}; };
}; };
} }

4
home/alacritty.nix
View file

@ -1,6 +1,6 @@
{super-config, ...}: {config, ...}:
let let
theme = import ../data/theme.nix {config = super-config; }; theme = import ../data/theme.nix {inherit config; };
in { in {
programs.alacritty = { programs.alacritty = {

14
home/default.nix
View file

@ -1,4 +1,4 @@
{pkgs, lib, super-config, ...}: {pkgs, ...}:
let let
user = import ../data/user.nix {}; user = import ../data/user.nix {};
in { in {
@ -47,19 +47,10 @@ in {
package = pkgs.whitesur-cursors; package = pkgs.whitesur-cursors;
size = 24; size = 24;
}; };
gtk3.extraConfig = {
gtk-application-prefer-dark-theme = super-config.darkMode == true;
};
gtk4.extraConfig = {
gtk-application-prefer-dark-theme = super-config.darkMode == true;
};
}; };
dconf.settings = { dconf.settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
color-scheme = lib.optionals (super-config.darkMode == true) "prefer-dark";
}; };
}; };
@ -72,7 +63,6 @@ in {
shell.enableZshIntegration = true; shell.enableZshIntegration = true;
sessionVariables = { sessionVariables = {
SSH_AUTH_SOCK = "/run/user/1000/ssh-agent";
EDITOR = "nvim"; EDITOR = "nvim";
VISUAL = "nvim"; VISUAL = "nvim";
GTK_THEME = "Breeze-Dark"; GTK_THEME = "Breeze-Dark";
@ -92,7 +82,6 @@ in {
packages = with pkgs; [ packages = with pkgs; [
# Add your global packages here # Add your global packages here
neovim neovim
bottom
git git
wget wget
curl curl
@ -102,7 +91,6 @@ in {
pavucontrol pavucontrol
ripgrep ripgrep
killall killall
x11_ssh_askpass
vanilla-dmz vanilla-dmz
(discord.override {withVencord = true;}) (discord.override {withVencord = true;})
bitwarden-desktop bitwarden-desktop

1
home/emacs.nix
View file

@ -14,7 +14,6 @@ in {
enchant2 # spell checking enchant2 # spell checking
enchant2.dev # for building jinx enchant2.dev # for building jinx
pkg-config pkg-config
git
ripgrep # for Emacs' ripgrep integration ripgrep # for Emacs' ripgrep integration
libvterm-neovim # vterm support for Emacs libvterm-neovim # vterm support for Emacs
nodejs_24 nodejs_24

25
home/git-ssh.nix
View file

@ -4,70 +4,53 @@
userName = "janis"; userName = "janis";
userEmail = "janis@nirgendwo.xyz"; userEmail = "janis@nirgendwo.xyz";
signing = {
format = "ssh";
key = "~/.ssh/duralumin_janis-github";
};
extraConfig = { extraConfig = {
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
safe = {
directory = "/etc/nixos/config";
};
commit = {
gpgsign = "true";
};
}; };
}; };
programs.ssh = { programs.ssh = {
addKeysToAgent = "yes";
enable = true; enable = true;
matchBlocks = { matchBlocks = {
"git.nirgendwo.xyz" = { "git.nirgendwo.xyz" = {
host = "git.nirgendwo.xyz"; host = "git.nirgendwo.xyz";
hostname = "git.nirgendwo.xyz"; hostname = "git.nirgendwo.xyz";
identityFile = "~/.ssh/id_ed25519_nirgendwo"; identityFile = "~/.ssh/id_ed25519_nirgendwo";
addKeysToAgent = "yes";
}; };
"nirgendwo.xyz" = { "nirgendwo.xyz" = {
host = "nirgendwo.xyz"; host = "nirgendwo.xyz";
hostname = "nirgendwo.xyz"; hostname = "nirgendwo.xyz";
identityFile = "~/.ssh/id_ed25519_nirgendwo"; identityFile = "~/.ssh/id_ed25519_nirgendwo";
addKeysToAgent = "yes";
}; };
"nirgendswo.com" = { "nirgendswo.com" = {
host = "nirgendswo.com"; host = "nirgendswo.com";
hostname = "nirgendswo.com"; hostname = "nirgendswo.com";
identityFile = "~/.ssh/id_ed25519_nirgendwo"; identityFile = "~/.ssh/id_ed25519_nirgendwo";
addKeysToAgent = "yes";
}; };
"nirgendwo" = { "nirgendwo" = {
host = "nirgendwo"; host = "nirgendwo";
hostname = "nirgendwo.xyz"; hostname = "nirgendwo.xyz";
user = "root"; user = "root";
identityFile = "~/.ssh/id_ed25519_nirgendwo"; identityFile = "~/.ssh/id_ed25519_nirgendwo";
addKeysToAgent = "yes";
}; };
"github.com:janis-bhm" = { "github.com:janis-bhm" = {
host = "github.com:janis-bhm"; host = "github.com:janis-bhm";
hostname = "github.com"; hostname = "github.com";
identityFile = "~/.ssh/duralumin_janis-github"; identityFile = "~/.ssh/duralumin_janis-github";
addKeysToAgent = "yes";
}; };
"github-janis" = { "github-janis-bhm" = {
host = "github-janis"; host = "github.com:janis-bhm";
hostname = "github.com"; hostname = "github.com";
user = "git"; user = "git";
identityFile = "~/.ssh/duralumin_janis-github"; identityFile = "~/.ssh/id_ed25519_github_janis";
addKeysToAgent = "yes";
}; };
"noonebtw.github.com" = { "noonebtw.github.com" = {
host = "noonebtw.github.com"; host = "noonebtw.github.com";
hostname = "github.com"; hostname = "github.com";
identityFile = "~/.ssh/id_ed25519_git"; identityFile = "~/.ssh/id_ed25519_git";
addKeysToAgent = "yes";
}; };
}; };
}; };

69
home/hyprlock_idle.nix
View file

@ -1,47 +1,44 @@
{pkgs, lib, super-config, ...}: { {pkgs, ...}: {
services.hyprpolkitagent.enable = true; services.hyprpolkitagent.enable = true;
programs.hyprlock.enable = true; programs.hyprlock.enable = true;
services.hypridle = lib.optionals (super-config.enableHypridle == true) { # services.hypridle = {
enable = true; # enable = true;
settings = let # settings = let
idle_timeout = "300"; # 5 minutes # idle_timeout = "300"; # 5 minutes
screen_timeout = "600"; # 10 minutes # screen_timeout = "600"; # 10 minutes
suspend_timeout = "900"; # 10 minutes # suspend_timeout = "900"; # 10 minutes
lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; # lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
suspend_cmd = "systemctl suspend"; # suspend_cmd = "systemctl suspend";
in{ # in{
general = { # general = {
inherit lock_cmd; # inherit lock_cmd;
before_sleep_cmd = "loginctl lock-session"; # before_sleep_cmd = "loginctl lock-session";
}; # };
listener = [ # listener = [
{ # {
timeout = idle_timeout; # timeout = idle_timeout;
on-timeout = "loginctl lock-session"; # on-timeout = "loginctl lock-session";
} # }
{ # {
timeout = screen_timeout; # timeout = screen_timeout;
on-timeout = "{pkgs.sway}/bin/swaymsg 'output * dpms off'"; # on-timeout = "{pkgs.sway}/bin/swaymsg 'output * dpms off'";
on-resume = "{pkgs.sway}/bin/swaymsg 'output * dpms on'"; # on-resume = "{pkgs.sway}/bin/swaymsg 'output * dpms on'";
} # }
{ # {
timeout = suspend_timeout; # timeout = suspend_timeout;
on-timeout = suspend_cmd; # on-timeout = suspend_cmd;
} # }
]; # ];
}; # };
}; # };
home.packages = with pkgs; [ home.packages = with pkgs; [
hyprlock hyprlock
] ++ (lib.optionals (super-config.enableHypridle == true) [ # hypridle
hypridle ];
]);
xdg.configFile."hypr/hyprlock.conf" = { xdg.configFile."hypr/hyprlock.conf" = {
source = "${pkgs.dotfiles}/.config/hypr/hyprlock.conf"; source = "${pkgs.dotfiles}/.config/hypr/hyprlock.conf";

7
home/sway.nix
View file

@ -34,11 +34,6 @@ in {
config = { config = {
modifier = "${mod}"; modifier = "${mod}";
fonts = {
names = ["SF Compact Rounded"];
size = 10.0;
};
seat = { seat = {
"*" = { "*" = {
xcursor_theme = "\"WhiteSur-cursors\" 32"; xcursor_theme = "\"WhiteSur-cursors\" 32";
@ -47,7 +42,7 @@ in {
output = { output = {
"*".scale = "${lib.strings.floatToString super-config.desktop_scale}"; "*".scale = "${lib.strings.floatToString super-config.desktop_scale}";
}// super-config.extraOutputConfig; };
startup = [ startup = [
{ {

37
home/waybar.nix
View file

@ -229,40 +229,50 @@ SSID: {essid} {frequency}'';
}; };
}; };
workspace-style = '' workspace-style = ''
/* And now modules themselves in their respective order */
.rounded_button {
padding-left: 0.3em;
padding-right: 0.3em;
border-radius: 0.5em;
margin-left: 0.2em;
margin-right: 0.2em;
margin-bottom: 0.2em;
}
/* Workspaces stuff */ /* Workspaces stuff */
#workspaces button { #workspaces button {
color: ${theme.extra.white}; color: ${theme.extra.white};
background: ${theme.extra.black}; background: ${theme.background};
padding-left: 5pt; padding-left: 0.3em;
padding-right: 5pt; padding-right: 0.3em;
border-radius: 5pt; border-radius: 0.5em;
margin-left: 2pt; margin-left: 0.2em;
margin-right: 2pt; margin-right: 0.2em;
margin-bottom: 2pt; margin-bottom: 0.2em;
} }
/* Inactive (on unfocused output) */ /* Inactive (on unfocused output) */
#workspaces button.visible { #workspaces button.visible {
color: ${theme.extra.white}; color: ${theme.extra.white};
background: ${theme.bright.magenta}; background: ${theme.extra.purple};
} }
/* Active (on focused output) */ /* Active (on focused output) */
#workspaces button.focused { #workspaces button.focused {
color: ${theme.extra.black}; color: ${theme.extra.black};
background: ${theme.bright.cyan}; background: ${theme.extra.aqua};
} }
/* Contains an urgent window */ /* Contains an urgent window */
#workspaces button.urgent { #workspaces button.urgent {
color: ${theme.bright.red}; color: ${theme.extra.black};
background: ${theme.extra.black}; background: ${theme.bright.red};
} }
/* Style when cursor is on the button */ /* Style when cursor is on the button */
#workspaces button:hover { #workspaces button:hover {
background: ${theme.bright.black}; background: ${theme.extra.black};
color: ${theme.extra.white}; color: ${theme.extra.white};
} }
@ -288,7 +298,6 @@ in {
}; };
style = '' style = ''
/* Reset all styles */
* { * {
border: none; border: none;
border-radius: 0; border-radius: 0;
@ -301,7 +310,7 @@ in {
#waybar { #waybar {
background: rgba(40, 40, 40, 0.3); background: rgba(40, 40, 40, 0.3);
color: #ffffff; color: #ffffff;
font-family: SF Compact Rounded; font-family: "sans-serif";
font-size: 12pt; font-size: 12pt;
font-weight: 500; font-weight: 500;
} }

10
hosts/desktop/default.nix
View file

@ -5,14 +5,8 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
darkMode = true; has_battery = true;
enableHypridle = true; desktop_scale = 1.3;
has_battery = false;
extraOutputConfig = {
"HDMI-A-3" = {pos = "0 0";};
"HDMI-A-1" = { pos = "1920 0"; };
};
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];

12
options.nix
View file

@ -18,22 +18,10 @@
description = "Enable dark mode for the system."; description = "Enable dark mode for the system.";
}; };
enableHypridle = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Enable hypridle for the system.";
};
desktop_scale = lib.mkOption { desktop_scale = lib.mkOption {
type = lib.types.float; type = lib.types.float;
default = 1.0; default = 1.0;
description = "HiDpi scale factor for the window manager"; description = "HiDpi scale factor for the window manager";
}; };
extraOutputConfig = lib.mkOption {
type = lib.types.attrsOf (lib.types.attrsOf lib.types.anything);
default = {};
description = "Additional config for sway outputs";
};
}; };
} }

12
system/default.nix
View file

@ -1,4 +1,4 @@
{inputs, pkgs, config, ...}: { {pkgs, config, ...}: {
imports = [ imports = [
../options.nix ../options.nix
]; ];
@ -68,18 +68,12 @@
source-sans source-sans
source-code-pro source-code-pro
pkgs.nur.repos.redpz.sf-mono pkgs.nur.repos.redpz.sf-mono
inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd
inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd
inputs.apple-fonts.packages.${pkgs.system}.sf-compact-nerd
inputs.apple-fonts.packages.${pkgs.system}.ny-nerd
]; ];
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
monospace = ["SF Mono" "Fira Mono" "Noto Mono"]; monospace = ["SF Mono" "Fira Mono" "Noto Mono"];
serif = ["Noto Serif"]; serif = ["Liberation Serif" "Noto Serif"];
sansSerif = ["SF Pro Text" "Noto Sans" "Roboto"]; sansSerif = ["Liberation Sans" "Noto Sans" "Roboto"];
emoji = ["Twitter Color Emoji" "Noto Emoji"]; emoji = ["Twitter Color Emoji" "Noto Emoji"];
}; };
}; };

3
user/default.nix
View file

@ -17,9 +17,6 @@ in {
programs.zsh.enable = true; programs.zsh.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
programs.ssh = {
startAgent = true;
};
services = { services = {
udisks2.enable = true; udisks2.enable = true;