Compare commits
No commits in common. "0f8f83be8987d9ad4ea1f10c2b507a6e3fcb80a0" and "0e0c620c548e0edcc62e681c34bcdb931e9afd48" have entirely different histories.
0f8f83be89
...
0e0c620c54
13 changed files with 63 additions and 130 deletions
54
flake.lock
generated
54
flake.lock
generated
|
|
@ -10,11 +10,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723293904,
|
||||
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
||||
"lastModified": 1720546205,
|
||||
"narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
||||
"rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -68,11 +68,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730135292,
|
||||
"narHash": "sha256-QUU1P8x42b8moaUsxJkamfcRXdyNjIq79ZThzT3CVUA=",
|
||||
"lastModified": 1722217815,
|
||||
"narHash": "sha256-8r5AJ3n8WEDw3rsZLALSuFQ5kJyWOcssNZvPxYLr2yc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0e55423bf8c241cf18676a8b8424c7eadd170ffc",
|
||||
"rev": "1e6f8a7b4634fc051cc9361959bf414fcf17e094",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -90,11 +90,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730132590,
|
||||
"narHash": "sha256-5XCF16oq/NBmx/2cJ8mK1kv+kOKNULcNWP0MsgMraq8=",
|
||||
"lastModified": 1722273087,
|
||||
"narHash": "sha256-uELMts/UTJ4jTPQbQgOnE75flmdbWm672yDvL3QLWOI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "64c6af10947cd17201570726eba26046e95ed58b",
|
||||
"rev": "087cf45264b4487b2848e08548bb4c5f933d460c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -140,11 +140,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -202,11 +202,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730016908,
|
||||
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
|
||||
"lastModified": 1722321190,
|
||||
"narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e83414058edd339148dc142a8437edb9450574c8",
|
||||
"rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -287,11 +287,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"lastModified": 1722062969,
|
||||
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -350,11 +350,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1729973466,
|
||||
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
||||
"lastModified": 1722087241,
|
||||
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
||||
"rev": "8c50662509100d53229d4be607f1a3a31157fa12",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -453,11 +453,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729104314,
|
||||
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
|
||||
"lastModified": 1721042469,
|
||||
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
|
||||
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -487,11 +487,11 @@
|
|||
"nixpkgs-24_05": "nixpkgs-24_05"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722877200,
|
||||
"narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
|
||||
"lastModified": 1721121314,
|
||||
"narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
|
||||
"rev": "059b50b2e729729ea00c6831124d3837c494f3d5",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
tools.fourmolu = pkgs.haskellPackages.fourmolu;
|
||||
tools.nixfmt = pkgs.nixfmt-rfc-style;
|
||||
hooks = {
|
||||
nixfmt-rfc-style.enable = true;
|
||||
nixfmt.enable = true;
|
||||
fourmolu.enable = true;
|
||||
hpack.enable = true;
|
||||
hlint.enable = true;
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
|
||||
withHoogle = true;
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
nativeBuildInputs = with pkgs; [
|
||||
haskellPackages.haskell-language-server
|
||||
haskellPackages.fourmolu
|
||||
haskellPackages.hspec-discover
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ in
|
|||
# better ls with icons and stuff, maybe also try lsd
|
||||
${myEza} = {
|
||||
enable = true;
|
||||
icons = "auto";
|
||||
icons = true;
|
||||
};
|
||||
|
||||
starship = {
|
||||
|
|
|
|||
|
|
@ -1,24 +1,11 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
electron-overlay = final: prev: { electron = final.electron_25; };
|
||||
in
|
||||
{
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
let electron-overlay = final: prev: { electron = final.electron_25; };
|
||||
in {
|
||||
imports = [ ];
|
||||
|
||||
users.users."alex" = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [
|
||||
"input"
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
"video"
|
||||
];
|
||||
extraGroups = [ "input" "networkmanager" "wheel" ];
|
||||
description = "Alexander Kobjolke";
|
||||
home = "/home/alex";
|
||||
shell = pkgs.zsh;
|
||||
|
|
|
|||
|
|
@ -44,20 +44,18 @@
|
|||
# social
|
||||
jitsi-meet-electron
|
||||
discord # talk to other people
|
||||
google-chrome
|
||||
|
||||
# system tools
|
||||
uhk-agent # my keyboard
|
||||
mosh # ssh via udp
|
||||
rclone
|
||||
|
||||
# gaming support
|
||||
lutris
|
||||
bottles
|
||||
wine64Packages.stagingFull
|
||||
scummvm
|
||||
|
||||
# reading
|
||||
calibre
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
programs.afew.enable = true;
|
||||
programs.mbsync.enable = true;
|
||||
programs.msmtp.enable = true;
|
||||
programs.notmuch = {
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@
|
|||
;;purescript ; javascript, but functional
|
||||
(python +lsp +tree-sitter +pyenv) ; beautiful is better than ugly
|
||||
qt ; the 'cutest' gui framework ever
|
||||
(racket +lsp +xp) ; a DSL for DSLs
|
||||
;;racket ; a DSL for DSLs
|
||||
;;raku ; the artist formerly known as perl6
|
||||
(rest +jq) ; Emacs as a REST client
|
||||
;;rst ; ReST in peace
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.shellAliases = {
|
||||
suspend = "systemctl hibernate";
|
||||
nrs = "sudo nixos-rebuild switch --flake ~/src/nixos-config";
|
||||
nrb = "sudo nixos-rebuild build --flake ~/src/nixos-config";
|
||||
nrs = "sudo nixos-rebuild switch --flake .";
|
||||
nrb = "sudo nixos-rebuild build --flake .";
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
|
|
@ -17,11 +12,7 @@
|
|||
autosuggestion.enable = true;
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
"git"
|
||||
"fzf"
|
||||
"z"
|
||||
];
|
||||
plugins = [ "git" "fzf" "fd" "z" ];
|
||||
theme = "simple";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -121,8 +121,8 @@ myConfig =
|
|||
, ("M-C-r", WS.swapNextScreen)
|
||||
, ("M-S-r", WS.shiftNextScreen)
|
||||
, -- scratchpads
|
||||
("M-s M-t", namedScratchpadAction scratchpads "shell")
|
||||
, ("M-s M-s", namedScratchpadAction scratchpads "notes")
|
||||
("M-s s", namedScratchpadAction scratchpads "notes")
|
||||
, ("M-s M-s", namedScratchpadAction scratchpads "shell")
|
||||
, -- backlight control
|
||||
|
||||
("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")
|
||||
|
|
@ -137,7 +137,6 @@ myConfig =
|
|||
, ("M-a", sendMessage Balance)
|
||||
, ("M-S-a", sendMessage Equalize)
|
||||
, ("M-o", sendMessage Rotate)
|
||||
, ("M-y", withFocused $ windows . W.sink)
|
||||
]
|
||||
where
|
||||
-- navigate using dvorak bindings
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config.services.dunst = {
|
||||
enable = true;
|
||||
iconTheme = {
|
||||
name = "Adwaita";
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
package = pkgs.gnome3.adwaita-icon-theme;
|
||||
size = "16x16";
|
||||
};
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
home = {
|
||||
|
|
@ -12,8 +7,8 @@
|
|||
packages = with pkgs; [
|
||||
firefox
|
||||
alacritty
|
||||
gnome-session
|
||||
gnome-control-center
|
||||
gnome.gnome-session
|
||||
gnome.gnome-control-center
|
||||
];
|
||||
keyboard.layout = "de";
|
||||
keyboard.variant = "nodeadkeys";
|
||||
|
|
@ -21,6 +16,6 @@
|
|||
|
||||
xsession = {
|
||||
enable = true;
|
||||
windowManager.command = "${pkgs.gnome-session}/bin/gnome-session";
|
||||
windowManager.command = "${pkgs.gnome.gnome-session}/bin/gnome-session";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,7 @@
|
|||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ inputs, config, pkgs, lib, ... }:
|
||||
let
|
||||
nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
|
||||
export __NV_PRIME_RENDER_OFFLOAD=1
|
||||
|
|
@ -17,8 +11,7 @@ let
|
|||
export __VK_LAYER_NV_optimus=NVIDIA_only
|
||||
exec "$@"
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
|
|
@ -40,21 +33,17 @@ in
|
|||
networking.hostName = "dregil"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
networking.networkmanager.enable =
|
||||
true; # Easiest to use and most distros use this by default.
|
||||
|
||||
networking.extraHosts = ''
|
||||
127.0.0.1 localhost dregil.localdomain dregil
|
||||
'';
|
||||
|
||||
i18n = {
|
||||
extraLocaleSettings = {
|
||||
TIME_STYLE = "iso";
|
||||
};
|
||||
supportedLocales = [
|
||||
"C.UTF-8/UTF-8"
|
||||
"en_US.UTF-8/UTF-8"
|
||||
"de_DE.UTF-8/UTF-8"
|
||||
];
|
||||
extraLocaleSettings = { TIME_STYLE = "iso"; };
|
||||
supportedLocales =
|
||||
[ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "de_DE.UTF-8/UTF-8" ];
|
||||
};
|
||||
|
||||
console = {
|
||||
|
|
@ -77,16 +66,9 @@ in
|
|||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
|
||||
# rtkit is optional but recommended
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
};
|
||||
# Enable sound.
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = true;
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
|
|
@ -105,17 +87,11 @@ in
|
|||
nix.settings.max-jobs = 3;
|
||||
nix.settings.cores = 4;
|
||||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
};
|
||||
programs.neovim = { enable = true; };
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
};
|
||||
programs.steam = { enable = true; };
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
};
|
||||
programs.zsh = { enable = true; };
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
|
|
@ -126,14 +102,8 @@ in
|
|||
|
||||
# Open ports in the firewall
|
||||
# 22000, 21027 syncthing discovery and connectivity
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
5223
|
||||
22000
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [
|
||||
21027
|
||||
22000
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = [ 5223 22000 ];
|
||||
networking.firewall.allowedUDPPorts = [ 21027 22000 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@
|
|||
hardware.nvidia = {
|
||||
nvidiaSettings = true;
|
||||
nvidiaPersistenced = true;
|
||||
open = true;
|
||||
|
||||
# modesetting.enable = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue