From f17722577a8a926dc7cc84fdaec6dca9dd978bec Mon Sep 17 00:00:00 2001 From: tristan Date: Wed, 19 Feb 2025 10:53:27 +0000 Subject: [PATCH] nixbook: update --- flake.lock | 42 +++++++++---------------------------- home/programs/graphical.nix | 7 +------ lib/nixvim.nix | 1 + nixos/default.nix | 1 + nixos/programs/hyprland.nix | 5 ++++- 5 files changed, 17 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index c4745fc..35bb5f4 100644 --- a/flake.lock +++ b/flake.lock @@ -470,15 +470,14 @@ "inputs": { "flake-compat": "flake-compat", "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1734745015, - "narHash": "sha256-HGl0yR/qfGTO99NfiB5bqTe2nPKmD57opzB/TwhJSW0=", + "lastModified": 1736997002, + "narHash": "sha256-EPbAFUXgu3agihgA+MJlQe6J18SIEZ4cRm+zhNRbGfo=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "1c922245aec471610533c7a225bf9c20e7002ff2", + "rev": "40534c1bc524aa8c433a7a30318d7e20bddb33fb", "type": "github" }, "original": { @@ -505,11 +504,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734600368, - "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "lastModified": 1736867362, + "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "type": "github" }, "original": { @@ -568,11 +567,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -681,27 +680,6 @@ "stylix": "stylix" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734661750, - "narHash": "sha256-BI58NBdimxu1lnpOrG9XxBz7Cwqy+qIf99zunWofX5w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "7d3d910d5fd575e6e8c5600d83d54e5c47273bfe", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5" diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index b174cfb..7a59f0c 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -27,12 +27,7 @@ youtube-music # other - element-desktop-wayland - (makeDesktopItem { - name = "element-desktop-wayland"; - desktopName = "Element"; - exec = "${element-desktop-wayland}/bin/element-desktop"; - }) + element-desktop brave bitwarden ]; diff --git a/lib/nixvim.nix b/lib/nixvim.nix index e6fdace..1d6a524 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -26,6 +26,7 @@ in { smartindent = true; scrolloff = 4; smoothscroll = true; + ignorecase = true; undofile = true; undodir = lua ''vim.fn.expand("$HOME/.local/share/nvim/undo")''; diff --git a/nixos/default.nix b/nixos/default.nix index ee802d7..55d0635 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -29,6 +29,7 @@ in { boot.loader.efi.canTouchEfiVariables = true; networking.networkmanager.enable = true; + programs.nm-applet.enable = true; # fix nixos-containers networking.nat.enable = true; diff --git a/nixos/programs/hyprland.nix b/nixos/programs/hyprland.nix index 0b00516..62e969b 100644 --- a/nixos/programs/hyprland.nix +++ b/nixos/programs/hyprland.nix @@ -1,5 +1,8 @@ {config, ...}: { - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + withUWSM = true; + }; security.pam.services.hyprlock = {}; imports = [