diff options
| -rw-r--r-- | flake.lock | 40 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | gui/apps/dev.nix | 12 | ||||
| -rw-r--r-- | gui/apps/web.nix | 3 | ||||
| -rw-r--r-- | gui/emacs.nix | 2 | ||||
| -rw-r--r-- | gui/qtile.nix | 2 | ||||
| -rw-r--r-- | gui/xmonad.nix | 2 |
7 files changed, 34 insertions, 31 deletions
@@ -6,11 +6,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1741249369, - "narHash": "sha256-No+ha689UJ2gPdKbQQ4iWx7Nxfo4Se1NCVkB7E4Z8kI=", + "lastModified": 1752460302, + "narHash": "sha256-/mdSXzHxi6ceep2mrH0UlUUO2enfPLQqRojbM+ZlPA4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d6871ef57d1e1e520d64e40c01b1f0f171d0c3f7", + "rev": "1741446afec9d812af576df394a2304f90e22257", "type": "github" }, "original": { @@ -27,27 +27,27 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1752391422, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "c26266790678863cce8e7460fdbf0d80991b1906", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -118,27 +118,27 @@ }, "stable": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1752308619, + "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "unstable": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { @@ -2,11 +2,11 @@ description = "Computing environment of Adrian Kummerlaender"; inputs = { - stable.url = github:NixOS/nixpkgs/nixos-24.11; + stable.url = github:NixOS/nixpkgs/nixos-25.05; unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable; personal.url = github:KnairdA/pkgs; home-manager = { - url = github:nix-community/home-manager/release-24.11; + url = github:nix-community/home-manager/release-25.05; inputs = { nixpkgs.follows = "stable"; }; }; emacs.url = github:nix-community/emacs-overlay/master; diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix index 851d7d8..81f5735 100644 --- a/gui/apps/dev.nix +++ b/gui/apps/dev.nix @@ -5,14 +5,22 @@ packages = with pkgs; [ # UI dev utilities (language environments are maintained in project specific nix-shells) hotspot - kcachegrind + kdePackages.kcachegrind + meld + + # Visualization and CAD paraview + #(blender.override { cudaSupport=true; }) blender - meld + freecad + meshlab + # language utilities artha + # calculator qalculate-gtk + # ctag to override the emacs provided ones (placeholder) universal-ctags fzf diff --git a/gui/apps/web.nix b/gui/apps/web.nix index 41fc878..3fcb931 100644 --- a/gui/apps/web.nix +++ b/gui/apps/web.nix @@ -6,8 +6,7 @@ pkgs.tdesktop pkgs.tigervnc pkgs.remmina - - pkgs-unstable.zotero + pkgs.zotero ]; }; diff --git a/gui/emacs.nix b/gui/emacs.nix index e8322fd..4aaab0b 100644 --- a/gui/emacs.nix +++ b/gui/emacs.nix @@ -51,7 +51,7 @@ org = prev.org.overrideAttrs(old: { patches = []; } ); }; - package = pkgs.emacs; + package = pkgs.emacs-unstable; config = ./conf/init.el; alwaysEnsure = false; diff --git a/gui/qtile.nix b/gui/qtile.nix index 3d40bc7..89fbab8 100644 --- a/gui/qtile.nix +++ b/gui/qtile.nix @@ -27,8 +27,6 @@ home.packages = [ # wm pkgs-unstable.qtile - # lockscreen - pkgs.i3lock ]; home.file.".config/qtile/config.py".source = ./conf/qtile.py; diff --git a/gui/xmonad.nix b/gui/xmonad.nix index 5ead6e4..972ccf8 100644 --- a/gui/xmonad.nix +++ b/gui/xmonad.nix @@ -29,8 +29,6 @@ home.packages = with pkgs; [ xdotool - # lockscreen - i3lock ]; services.screen-locker = { |