diff options
| -rw-r--r-- | configs/repo-sync/wiki.nix | 1 | ||||
| -rw-r--r-- | pkgs/haskell/desktop-pager.nix | 6 | ||||
| -rw-r--r-- | pkgs/haskell/hack.nix | 14 | ||||
| -rw-r--r-- | pkgs/haskell/much.nix | 4 | ||||
| -rw-r--r-- | pkgs/haskell/terminal-utilities.nix | 13 | ||||
| -rw-r--r-- | systems/querel/config.nix | 32 |
6 files changed, 36 insertions, 34 deletions
diff --git a/configs/repo-sync/wiki.nix b/configs/repo-sync/wiki.nix index 94f7e80..01e03f0 100644 --- a/configs/repo-sync/wiki.nix +++ b/configs/repo-sync/wiki.nix @@ -1,6 +1,7 @@ { config, lib, mylib, pkgs, ... }: { krebs.repo-sync.enable = true; krebs.repo-sync.repos.wiki.branches.hotdog = { + smart = true; origin.url = "http://cgit.hotdog.r/wiki"; mirror.url = "git@${config.krebs.build.host.name}.r:wiki"; }; diff --git a/pkgs/haskell/desktop-pager.nix b/pkgs/haskell/desktop-pager.nix index a2f1243..fd90c1e 100644 --- a/pkgs/haskell/desktop-pager.nix +++ b/pkgs/haskell/desktop-pager.nix @@ -5,11 +5,11 @@ }: mkDerivation { pname = "desktop-pager"; - version = "1.0.1"; + version = "1.0.2"; src = fetchgit { url = "https://cgit.krebsco.de/desktop-pager"; - sha256 = "1144vv5i4hihdyii29xj6dinkidjxr1x39w5ffyff7ls9q17xdms"; - rev = "cb65a330a178dc75eabc4bf6659da7aac439ae2d"; + sha256 = "1dvqm8a0d8lh227ck0dhyfxkjknhjgjpcwjh3dvps3721p1qldjn"; + rev = "f792f1db052afd4f4af9bca568fe2b8fb96ea7e8"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/haskell/hack.nix b/pkgs/haskell/hack.nix index 0eb0232..b6c3ca6 100644 --- a/pkgs/haskell/hack.nix +++ b/pkgs/haskell/hack.nix @@ -1,22 +1,22 @@ { mkDerivation, base, blessings, containers, data-default, fetchgit -, lens, lib, mtl, old-locale, process, terminal-scanner, time, unix -, zippers +, lens, lib, mono-traversable, mtl, old-locale, process +, terminal-scanner, time, unix, zippers }: mkDerivation { pname = "hack"; - version = "1.0.3"; + version = "1.0.4"; src = fetchgit { url = "https://cgit.krebsco.de/hack"; - sha256 = "04vxcfm204sxn3v48ch27srgqgpiqbm9i82lrmgp1yyx84wchq32"; - rev = "a6fc1e51f1f87a7cc485a47000f23f1f054beb95"; + sha256 = "1in95j2fx12kh994ajd5wpzsf5nrk7bs1rqjjnn7gq5zal216kkq"; + rev = "4f81ea639fb7754b1169f358bdae8225e6e4e2b3"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ - base blessings containers data-default lens mtl old-locale process - terminal-scanner time unix zippers + base blessings containers data-default lens mono-traversable mtl + old-locale process terminal-scanner time unix zippers ]; license = lib.licenses.mit; mainProgram = "hack"; diff --git a/pkgs/haskell/much.nix b/pkgs/haskell/much.nix index 6a573fc..cdfe011 100644 --- a/pkgs/haskell/much.nix +++ b/pkgs/haskell/much.nix @@ -13,8 +13,8 @@ mkDerivation { version = "1.4.2"; src = fetchgit { url = "https://cgit.krebsco.de/much"; - sha256 = "1michcp8j1d84gpcyp5m4jrp2lvs1al38glrixkr3xdgaxrs8iqb"; - rev = "8ba70458b8f5949db00c5840c76027c317bf6bc4"; + sha256 = "088cbzlvh23625617qyp1s3q0qb4il4b3f4ji061gq3bikycrhkf"; + rev = "36184551980eb59b67189c2a782c7f4461285d23"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/haskell/terminal-utilities.nix b/pkgs/haskell/terminal-utilities.nix new file mode 100644 index 0000000..eeab32f --- /dev/null +++ b/pkgs/haskell/terminal-utilities.nix @@ -0,0 +1,13 @@ +{ mkDerivation, base, fetchgit, lib }: +mkDerivation { + pname = "terminal-utilities"; + version = "1.0.0"; + src = fetchgit { + url = "https://cgit.krebsco.de/terminal-utilities"; + sha256 = "0kpkm87g5ab0s22zly994ql8hfc0gbqc5s7ln4ngav2k91a0wp7j"; + rev = "e2c0cc11a71c785b268f31f60bed2a79e00a4d61"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ base ]; + license = lib.licenses.mit; +} diff --git a/systems/querel/config.nix b/systems/querel/config.nix index dff928e..f2ce280 100644 --- a/systems/querel/config.nix +++ b/systems/querel/config.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: { imports = [ - ../../configs/retiolum.nix + ../../configs/retiolum.nix ]; krebs.build.host = config.krebs.hosts.querel; @@ -11,7 +11,6 @@ allowDiscards = true; device = "/dev/sda2"; }; - boot.kernelModules = [ "kvm-intel" ]; boot.loader = { efi.canTouchEfiVariables = true; systemd-boot.enable = true; @@ -20,15 +19,9 @@ environment.systemPackages = [ pkgs.firefox pkgs.gimp - pkgs.kate + pkgs.kdePackages.kate pkgs.libreoffice - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) pkgs.nsxiv - pkgs.texlive.combined.scheme-full - pkgs.vim - pkgs.xsane pkgs.zathura ]; @@ -48,6 +41,7 @@ }; }; + hardware.cpu.intel.updateMicrocode = true; hardware.enableRedistributableFirmware = true; i18n.defaultLocale = "de_DE.UTF-8"; @@ -56,22 +50,14 @@ programs.ssh.startAgent = false; - services.pulseaudio.enable = true; - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e"; - - services.xserver.libinput.enable = false; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; + services.xserver.xkb.layout = "de"; + services.xserver.xkb.options = "eurosign:e"; - services.xserver.desktopManager.plasma5.enable = true; + services.desktopManager.plasma6.enable = true; - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "itak"; + services.displayManager.autoLogin.user = "itak"; + services.displayManager.defaultSession = "plasma"; users.users.itak = { inherit (config.krebs.users.itak) home uid; @@ -82,4 +68,6 @@ "networkmanager" ]; }; + + system.stateVersion = "25.11"; } |