talos: framework-tool is added by nixos-hardware

talos: use unstable for zed
flake.lock: Update
2024-06-07 15:35:17 +02:00 · 2024-06-07 15:34:58 +02:00 · 2024-06-07 15:32:24 +02:00 · 2024-06-07 09:49:57 +02:00 · 2024-06-04 16:53:37 +02:00 · 2024-06-04 15:00:28 +02:00
6 changed files with 42 additions and 38 deletions
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@ -23,7 +23,7 @@ in {
    programs.gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
-      pinentryFlavor = "qt";
+      pinentryPackage = pkgs.pinentry-qt;
    };

    services = {
@ -34,13 +34,16 @@ in {
          if config.my.gui.isNvidia
          then ["nvidia"]
          else options.services.xserver.videoDrivers.default;
-        layout = "fr";
-        xkbVariant = "us";
-        libinput = {
-          enable = true;
-          touchpad = {
-            naturalScrolling = true;
-          };
+        xkb = {
+          layout = "fr";
+          variant = "us";
+        };
+      };
+
+      libinput = {
+        enable = true;
+        touchpad = {
+          naturalScrolling = true;
        };
      };

--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1707830867,
-        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
+        "lastModified": 1716561646,
+        "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
+        "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
        "type": "github"
      },
      "original": {
@ -48,11 +48,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1711934712,
-        "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=",
+        "lastModified": 1717032306,
+        "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9",
+        "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33",
        "type": "github"
      },
      "original": {
@ -109,27 +109,27 @@
        ]
      },
      "locked": {
-        "lastModified": 1715381426,
-        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1711352745,
-        "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
+        "lastModified": 1716987116,
+        "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
+        "rev": "8251761f93d6f5b91cee45ac09edb6e382641009",
        "type": "github"
      },
      "original": {
@ -157,11 +157,11 @@
    },
    "nixpkgs-unstable-small": {
      "locked": {
-        "lastModified": 1711983799,
-        "narHash": "sha256-Wo9rOsVxGIMcLmFilSai2Fi7kN50doxsuksoTIXPytI=",
+        "lastModified": 1717737457,
+        "narHash": "sha256-hqHp0W7ibfdu5DFc6EG3S3c+GSAbti7VUldFXSf/WiI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8bea75f6bdceecb9a349e7425ae2ca5c91c01b9c",
+        "rev": "bf3faad723ca984fc4ea95c1cee1d975a8ca2a28",
        "type": "github"
      },
      "original": {
@ -173,11 +173,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1711715736,
-        "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
+        "lastModified": 1716914467,
+        "narHash": "sha256-KkT6YM/yNQqirtYj/frn6RRakliB8RDvGqVGGaNhdcU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
+        "rev": "4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4",
        "type": "github"
      },
      "original": {
@ -189,16 +189,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1716361217,
-        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+        "lastModified": 1717281328,
+        "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+        "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@ -5,7 +5,7 @@
      type = "github";
      owner = "NixOS";
      repo = "nixpkgs";
-      ref = "nixos-23.11";
+      ref = "nixos-24.05";
    };

    nixpkgs-unstable-small = {
@ -25,7 +25,7 @@
      type = "github";
      owner = "nix-community";
      repo = "home-manager";
-      ref = "release-23.11";
+      ref = "release-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

--- a/home/tridactylrc
+++ b/home/tridactylrc
@ -18,6 +18,8 @@ bind ,<Space> nohlsearch
 " case insensitive if lowercase, case sensitive if using some uppercase letters
 set findcase smart

+set modeindicatormodes {"ignore": "false"}
+
 " New reddit is bad
 " autocmd DocStart ^http(s?)://www.reddit.com js tri.excmds.urlmodify("-t", "www", "old")

--- a/hosts/talos/default.nix
+++ b/hosts/talos/default.nix
@ -148,16 +148,15 @@
  services.xserver.enable = true;

  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm = {
+  services.displayManager.sddm = {
    enable = true;
    wayland.enable = true;
  };
-  services.xserver.displayManager.defaultSession = "plasmawayland";
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
  services.power-profiles-daemon.enable = true;

  environment.systemPackages = [
-    pkgs.framework-tool
+    pkgs.unstable.zed-editor
  ];

  #programs.hyprland.enable = true;
--- a/modules/sddm.nix
+++ b/modules/sddm.nix
@ -15,7 +15,7 @@ in {
  options.my.displayManager.sddm.enable = mkEnableOption "SDDM setup";

  config = mkIf cfg.enable {
-    services.xserver.displayManager.sddm = {
+    services.displayManager.sddm = {
      enable = true;
      theme = "sugar-candy";
    };
Author	SHA1	Message	Date
Antoine Martin	a3926692d4	talos: framework-tool is added by nixos-hardware	2024-06-07 15:35:17 +02:00
Antoine Martin	b8bb582c14	talos: use unstable for zed	2024-06-07 15:34:58 +02:00
Antoine Martin	6a4b7790fd	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/1f1bda965c8e6e19d7656caf4821632b7e77d317' (2024-05-29) → 'github:NixOS/nixpkgs/bf3faad723ca984fc4ea95c1cee1d975a8ca2a28' (2024-06-07)	2024-06-07 15:32:24 +02:00
Antoine Martin	f80fcd4a55	talos: try out zed	2024-06-07 09:49:57 +02:00
Antoine Martin	6b7f821e7d	talos: switch to Plasma 6	2024-06-04 16:53:37 +02:00
Antoine Martin	19dcc7ea01	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8' (2024-05-30) → 'github:NixOS/nixpkgs/b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1' (2024-06-01)	2024-06-04 15:00:28 +02:00
Antoine Martin	29a0fa6a25	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8' (2024-05-29) → 'github:NixOS/nixpkgs/d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8' (2024-05-30)	2024-05-31 16:16:21 +02:00
Antoine Martin	b7dc2ce532	flake.lock: Update Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/8cb01a0e717311680e0cbca06a76cbceba6f3ed6' (2024-02-13) → 'github:ryantm/agenix/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9' (2024-05-24) • Updated input 'disko': 'github:nix-community/disko/611c9ea53250f7bb22286b3d26872280a0e608f9' (2024-04-01) → 'github:nix-community/disko/8ea5bcccc03111bdedaeaae9380dfab61e9deb33' (2024-05-30) • Updated input 'disko/nixpkgs': 'github:NixOS/nixpkgs/807c549feabce7eddbf259dbdcec9e0600a0660d' (2024-03-29) → 'github:NixOS/nixpkgs/4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4' (2024-05-28) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0' (2024-03-25) → 'github:NixOS/nixos-hardware/8251761f93d6f5b91cee45ac09edb6e382641009' (2024-05-29) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/8bea75f6bdceecb9a349e7425ae2ca5c91c01b9c' (2024-04-01) → 'github:NixOS/nixpkgs/1f1bda965c8e6e19d7656caf4821632b7e77d317' (2024-05-29)	2024-05-30 13:08:30 +02:00
Antoine Martin	3225652d57	adapt xserver options	2024-05-30 01:56:11 +02:00
Antoine Martin	0438a91039	adapt displayManager options	2024-05-30 01:56:11 +02:00
Antoine Martin	8bfdb62a52	base: update pinentry option	2024-05-30 01:56:11 +02:00
Antoine Martin	db03c81eeb	flake: bump NixOS to 24.05	2024-05-30 01:56:02 +02:00
Antoine Martin	da83517ab0	home: hide ignore mode in tridactyl	2024-05-30 01:32:49 +02:00