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

Compare commits

base: jakalx:a9da0426fbbbd4fdc7b7b1d23437621f288cbfe9
Branches Tags
jakalx:main
jakalx:develop
jakalx:feature/hledger-web-module
..
compare: jakalx:75c91e50c1290e1ec8c17bfb93242494702068cc
Branches Tags
jakalx:develop
jakalx:main
jakalx:feature/hledger-web-module

No commits in common. "a9da0426fbbbd4fdc7b7b1d23437621f288cbfe9" and "75c91e50c1290e1ec8c17bfb93242494702068cc" have entirely different histories.
a9da0426fb ... 75c91e50c1

12 changed files with 31 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

55
flake.lock generated
View file

@ -81,27 +81,6 @@
"type": "github" "type": "github"
} }
}, },
"distro-grub-themes": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1734806114,
"narHash": "sha256-FWkDtoLMTTk2Lz4d4LkFjtV/xYyIlpwZlX5Np1QhXls=",
"owner": "AdisonCavani",
"repo": "distro-grub-themes",
"rev": "ebbd17419890059e371a6f2dbf2a7e76190327d4",
"type": "github"
},
"original": {
"owner": "AdisonCavani",
"repo": "distro-grub-themes",
"type": "github"
}
},
"emacs": { "emacs": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -155,24 +134,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems_2"
},
"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"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -496,7 +457,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"disko": "disko", "disko": "disko",
"distro-grub-themes": "distro-grub-themes",
"emacs": "emacs", "emacs": "emacs",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
@ -576,21 +536,6 @@
"type": "github" "type": "github"
} }
}, },
"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"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,

34
flake.nix
View file

@ -4,11 +4,6 @@
stable.url = "github:NixOS/nixpkgs/nixos-24.11"; stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05";
distro-grub-themes = {
url = "github:AdisonCavani/distro-grub-themes";
inputs.nixpkgs.follows = "nixpkgs";
};
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
@ -80,11 +75,10 @@
}; };
}; };
nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem rec { nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit system;
}; };
modules = [ modules = [
( (
@ -111,11 +105,10 @@
]; ];
}; };
nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem rec { nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit system;
stable = import inputs.stable { system = "x86_64-linux"; }; stable = import inputs.stable { system = "x86_64-linux"; };
}; };
modules = [ ./hosts/dregil ]; modules = [ ./hosts/dregil ];
@ -132,7 +125,7 @@
nixOnDroidConfigurations.default = nixOnDroidConfigurations.default =
with inputs; with inputs;
nix-on-droid.lib.nixOnDroidConfiguration { nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = import nixpkgs-droid { }; pkgs = import nixpkgs-droid {};
modules = [ modules = [
./hosts/redmi ./hosts/redmi
{ nix.registry.nixpkgs.flake = nixpkgs-droid; } { nix.registry.nixpkgs.flake = nixpkgs-droid; }
@ -145,12 +138,29 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
in in
pkgs.mkShell { pkgs.haskellPackages.shellFor {
inherit (self.checks.${system}.pre-commit-check) shellHook; inherit (self.checks.${system}.pre-commit-check) shellHook;
packages = with pkgs; [ packages = p: [
p.xmonad
p.xmonad-contrib
];
withHoogle = true;
buildInputs = with pkgs; [
haskellPackages.haskell-language-server
haskellPackages.fourmolu
haskellPackages.hspec-discover
haskellPackages.doctest
haskellPackages.xmonad
haskellPackages.xmonad-contrib
cabal-install
ghcid
nixfmt-rfc-style nixfmt-rfc-style
nil nil
hpack
hlint
]; ];
}; };
}; };

9
home/alex/home.nix
View file

@ -10,7 +10,6 @@
./cli.nix ./cli.nix
./programs/rofi ./programs/rofi
./programs/xmonad ./programs/xmonad
#./programs/i3
./programs/jitsi-meet ./programs/jitsi-meet
./programs/simplex-chat ./programs/simplex-chat
./programs/zathura ./programs/zathura
@ -18,7 +17,7 @@
./services/polybar ./services/polybar
./services/dunst ./services/dunst
./services/udiskie ./services/udiskie
# ./services/picom ./services/picom
./services/screen-locker ./services/screen-locker
./services/blueman-applet ./services/blueman-applet
./services/network-manager ./services/network-manager
@ -50,10 +49,9 @@
uhk-agent # my keyboard uhk-agent # my keyboard
mosh # ssh via udp mosh # ssh via udp
rclone rclone
parallel-disk-usage
gdu
# gaming support # gaming support
lutris
stable.bottles stable.bottles
wine64Packages.stagingFull wine64Packages.stagingFull
scummvm scummvm
@ -69,6 +67,7 @@
programs = { programs = {
alacritty.enable = true; alacritty.enable = true;
# autorandr.enable = true;
browserpass = { browserpass = {
enable = true; enable = true;
@ -112,5 +111,7 @@
''; '';
}; };
# services.autorandr = { enable = true; };
xsession.enable = true; xsession.enable = true;
} }

2
home/alex/programs/emacs/doom/config.el
View file

@ -74,8 +74,6 @@
(setq! undo-limit 80000000 ; Raise undo-limit to 80Mb (setq! undo-limit 80000000 ; Raise undo-limit to 80Mb
auto-save-default t ; Nobody likes to loose work, I certainly don't auto-save-default t ; Nobody likes to loose work, I certainly don't
switch-to-buffer-in-dedicated-window 'pop
switch-to-buffer-obey-display-actions t
) )
;; tweak some VI defaults ;; tweak some VI defaults

15
home/alex/programs/i3/default.nix
View file

@ -1,15 +0,0 @@
{
config,
lib,
pkgs,
...
}:
{
config.xsession.windowManager.i3 = {
enable = true;
config = {
modifier = "Mod4";
};
};
}

2
home/alex/services/screen-locker/default.nix
View file

@ -7,7 +7,7 @@
{ {
config.services.screen-locker = { config.services.screen-locker = {
enable = false; enable = true;
inactiveInterval = 30; inactiveInterval = 30;
lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c 000000"; lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c 000000";
xautolock.extraOptions = [ "-detectsleep" ]; xautolock.extraOptions = [ "-detectsleep" ];

8
hosts/dregil/default.nix
View file

@ -1,7 +1,9 @@
{ {
lib,
config,
pkgs,
inputs, inputs,
stable, stable,
system,
... ...
}: }:
{ {
@ -22,13 +24,9 @@
../../modules/common-system.nix ../../modules/common-system.nix
./configuration.nix ./configuration.nix
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.distro-grub-themes.nixosModules.${system}.default
../../home/anne/default.nix ../../home/anne/default.nix
../../home/alex/default.nix ../../home/alex/default.nix
../../modules/grub-themes
../../modules/hyprland
../../modules/podman ../../modules/podman
../../modules/tailscale ../../modules/tailscale
../../modules/flatpak.nix
]; ];
} }

18
modules/flatpak.nix
View file

@ -1,18 +0,0 @@
{
config,
lib,
pkgs,
...
}:
{
services.flatpak.enable = true;
systemd.services.flatpak-repo = {
wantedBy = [ "multi-user.target" ];
path = [ pkgs.flatpak ];
script = ''
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
'';
};
}

7
modules/grub-themes/default.nix
View file

@ -1,7 +0,0 @@
{ ... }:
{
config.distro-grub-themes = {
enable = true;
theme = "nixos";
};
}

10
modules/hyprland/default.nix
View file

@ -1,10 +0,0 @@
{
pkgs,
...
}:
{
config.programs.hyprland.enable = true;
config.environment.systemPackages = [ pkgs.kitty ];
config.environment.sessionVariables.NIXOS_OZONE_WL = "1";
}

18
modules/wm/greetd.nix
View file

@ -1,18 +0,0 @@
{
config,
lib,
pkgs,
...
}:
{
services.greetd = {
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
user = "greeter";
};
};
};
}

24
modules/wm/sway.nix
View file

@ -1,24 +0,0 @@
{
config,
pkgs,
lib,
...
}:
{
environment.systemPackages = with pkgs; [
grim # screenshot functionality
slurp # screenshot functionality
wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
mako # notification system developed by swaywm maintainer
];
# Enable the gnome-keyring secrets vault.
# Will be exposed through DBus to programs willing to store secrets.
services.gnome.gnome-keyring.enable = true;
# enable Sway window manager
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
};
}