From 90d6d6ae85962786f6232e0df32379eede5b0d79 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 May 2024 21:27:45 +0200 Subject: [PATCH 01/15] go lesbian --- Cargo.lock | 87 +++++++++++++++++++++++++++++++++- common.nix | 10 ++++ flake.lock | 134 ++++++++++++++++++++++++++++++++++++++++++++--------- flake.nix | 17 +++++-- 4 files changed, 221 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 752d275..ebfd75c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -127,6 +127,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "cassowary" version = "0.3.0" @@ -233,6 +239,22 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi 0.3.9", +] + [[package]] name = "crossterm" version = "0.27.0" @@ -279,6 +301,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "ego-tree" version = "0.6.2" @@ -303,6 +331,24 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "getrandom" version = "0.2.14" @@ -384,6 +430,23 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +[[package]] +name = "inquire" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a" +dependencies = [ + "bitflags 2.5.0", + "crossterm 0.25.0", + "dyn-clone", + "fuzzy-matcher", + "fxhash", + "newline-converter", + "once_cell", + "unicode-segmentation", + "unicode-width", +] + [[package]] name = "itertools" version = "0.12.1" @@ -400,7 +463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] -name = "jrnl" +name = "j" version = "0.1.0" dependencies = [ "chrono", @@ -408,6 +471,7 @@ dependencies = [ "dirs", "ego-tree", "indexmap", + "inquire", "markdown", "owo-colors", "petgraph", @@ -511,6 +575,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "newline-converter" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "num-traits" version = "0.2.18" @@ -616,7 +689,7 @@ dependencies = [ "bitflags 2.5.0", "cassowary", "compact_str", - "crossterm", + "crossterm 0.27.0", "indoc", "itertools", "lru", @@ -851,6 +924,16 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "unicode-ident" version = "1.0.12" diff --git a/common.nix b/common.nix index 21aa36d..128ecb2 100644 --- a/common.nix +++ b/common.nix @@ -5,13 +5,23 @@ config, pkgs, lib, + lix-module, rs-programs, ... }: with lib; with builtins; { + imports = [lix-module.nixosModules.default]; nix = { package = pkgs.nixVersions.stable; + settings = { + extra-substituters = [ + "https://cache.lix.systems" + ]; + trusted-public-keys = [ + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; + }; extraOptions = '' experimental-features = nix-command flakes keep-outputs = true diff --git a/flake.lock b/flake.lock index 9e32b5c..c245eab 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1713459701, - "narHash": "sha256-LjQ11ASxnv/FXfb8QnrIyMkyqSqcBPX+lFK8gu0jSQE=", + "lastModified": 1714864355, + "narHash": "sha256-uXNW6bapWFfkYIkK1EagydSrFMqycOYEDSq75GmUpjk=", "owner": "ipetkov", "repo": "crane", - "rev": "45ea0059fb325132fdc3c39faffb0941d25d08d3", + "rev": "442a7a6152f49b907e73206dc8e1f46a61e8e873", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713594079, - "narHash": "sha256-lYWehi0cqBdsL1W4xeUnUcXw4U4aBKKCmmQrR01yqE0=", + "lastModified": 1714976745, + "narHash": "sha256-SAYU6uaVcUmckp/RFxkndz7u7eX1D69piTIMmAAop6Y=", "owner": "nix-community", "repo": "fenix", - "rev": "3247290e1bba55878a2c62d43894d0309d29c918", + "rev": "a291b6ad30f4ec949e6c98dde43d73d2946515c3", "type": "github" }, "original": { @@ -41,6 +41,39 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -48,11 +81,11 @@ ] }, "locked": { - "lastModified": 1713566308, - "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "057117a401a34259c9615ce62218aea7afdee4d3", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -61,6 +94,48 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1714955862, + "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", + "ref": "refs/tags/2.90-beta.1", + "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", + "revCount": 15501, + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + }, + "original": { + "ref": "refs/tags/2.90-beta.1", + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714868057, + "narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=", + "ref": "refs/heads/main", + "rev": "e31baf57680bab449ab5b40179cc4a08a99f5314", + "revCount": 62, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "mac-brcm-fw": { "flake": false, "locked": { @@ -92,11 +167,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -107,11 +182,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1714782413, + "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "651b4702e27a388f0f18e1b970534162dec09aff", "type": "github" }, "original": { @@ -122,11 +197,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1713597487, - "narHash": "sha256-bD+FqUZidTjHblGjK+2LpIaHBmo1THF1HW3o4ZBqmrw=", + "lastModified": 1715010189, + "narHash": "sha256-VG/ax2TLmsF0G8M3Q/lE0P7U/pzky8NScim8ZGmIfAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0f9060ec3937d5a7cf3ce6c698e14d989b453e5", + "rev": "95269ee8dbc9daacad586e8ad87567369a7e1042", "type": "github" }, "original": { @@ -140,6 +215,8 @@ "crane": "crane", "fenix": "fenix", "home-manager": "home-manager", + "lix": "lix", + "lix-module": "lix-module", "mac-brcm-fw": "mac-brcm-fw", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -150,11 +227,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713559870, - "narHash": "sha256-HsVa+QM2vMra80OjnjH7JhdvLeJuMdR4sxBNHJveMe4=", + "lastModified": 1714936835, + "narHash": "sha256-M+PpgfRMBfHo8Jb2ou/s3maAZbps0XnuHXQU9Hv9vL0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "c83d8cf5844fff3d6e243ab408669222059af1c6", + "rev": "c4618fe14d39992fbbb85c2d6cad028a232c13d2", "type": "github" }, "original": { @@ -163,6 +240,21 @@ "repo": "rust-analyzer", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index caba18a..a72ed00 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,15 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; + lix = { + url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; + flake = false; + }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + inputs.lix.follows = "lix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -17,7 +26,6 @@ crane = { url = "github:ipetkov/crane"; inputs = { - flake-utils.follows = "flake-utils"; nixpkgs.follows = "nixpkgs"; }; }; @@ -32,6 +40,7 @@ nixpkgs, nixpkgs-stable, nixpkgs-unstable-small, + lix-module, home-manager, nixos-hardware, mac-brcm-fw, @@ -82,7 +91,7 @@ nixosConfigurations = { monosodium-glutamate-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; }; system = "x86_64-linux"; modules = [ @@ -107,7 +116,7 @@ }; catbook-j = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; }; system = "x86_64-linux"; modules = [ @@ -132,7 +141,7 @@ }; potatobook-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small rs-programs; + inherit inputs pkgs-unstable-small rs-programs lix-module; }; system = "x86_64-linux"; modules = [ From caaa7c7c6baaa522dfa90b08df58c20602f645d1 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 May 2024 21:32:14 +0200 Subject: [PATCH 02/15] fix deprecation warnings --- hosts/catbook-j/configuration.nix | 2 +- hosts/catbook-j/modules/input.nix | 2 +- hosts/potatobook-g/configuration.nix | 7 ++++--- modules/desktop/creative.nix | 7 ++++++- modules/desktop/default.nix | 3 +-- modules/desktop/themeing.nix | 2 +- modules/desktop/x.nix | 3 ++- modules/input/default.nix | 13 +++++++------ 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 81a0966..a380743 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -78,7 +78,7 @@ }; boot.kernelPackages = pkgs.linuxPackages_zen; - services.xserver.displayManager.autoLogin = { + services.displayManager.autoLogin = { enable = true; user = "jade"; }; diff --git a/hosts/catbook-j/modules/input.nix b/hosts/catbook-j/modules/input.nix index 7043eec..f6d8fee 100644 --- a/hosts/catbook-j/modules/input.nix +++ b/hosts/catbook-j/modules/input.nix @@ -23,5 +23,5 @@ sensitivity = 256; }; - services.xserver.libinput.touchpad.tapping = false; + services.libinput.touchpad.tapping = false; } diff --git a/hosts/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix index c45c889..530f8db 100644 --- a/hosts/potatobook-g/configuration.nix +++ b/hosts/potatobook-g/configuration.nix @@ -65,9 +65,10 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - services.xserver.libinput.touchpad.disableWhileTyping = true; - services.xserver.libinput.touchpad.tapping = false; - + services.libinput.touchpad = { + disableWhileTyping = true; + tapping = false; + }; networking.networkmanager.enable = true; networking.hostName = "potatobook-g"; diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index 2eebca9..0828381 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + pkgs-stable, + ... +}: { home-manager.users.jade = {pkgs, ...}: { home.packages = with pkgs; [ audacity @@ -18,6 +22,7 @@ openscad-unstable openscad-lsp + pkgs-stable.font-manager fontforge-gtk onlyoffice-bin_latest diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index bb04410..7f91df6 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -67,7 +67,7 @@ in services.illum.enable = true; services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; openFirewall = true; }; services.smartd = { @@ -124,7 +124,6 @@ in jellyfin-media-player # from environment.systemPackages cleanup - font-manager xdotool xorg.xwininfo gparted diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index b310287..c5eb7d8 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -37,7 +37,7 @@ }; qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; }; }; diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix index dab34ec..50f9666 100644 --- a/modules/desktop/x.nix +++ b/modules/desktop/x.nix @@ -7,7 +7,6 @@ }; displayManager = { - defaultSession = "none+xmonad"; gdm.enable = true; }; @@ -15,4 +14,6 @@ enable = true; }; }; + + services.displayManager.defaultSession = "none+xmonad"; } diff --git a/modules/input/default.nix b/modules/input/default.nix index 88302da..62b0ec9 100644 --- a/modules/input/default.nix +++ b/modules/input/default.nix @@ -2,14 +2,15 @@ imports = [ ./evremap.nix ]; - services.xserver = { - xkb = { - layout = "us"; - variant = "altgr-intl"; - }; - + services = { libinput = { enable = true; }; + xserver = { + xkb = { + layout = "us"; + variant = "altgr-intl"; + }; + }; }; } From 73bbc7c616e0e4d8bde3fbbbedaf431410661d71 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 May 2024 21:33:14 +0200 Subject: [PATCH 03/15] jrnl: shorten command and add inquire --- programs/jrnl/Cargo.toml | 3 ++- programs/jrnl/src/commands/add_entry.rs | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/programs/jrnl/Cargo.toml b/programs/jrnl/Cargo.toml index 12f231a..8e3044a 100644 --- a/programs/jrnl/Cargo.toml +++ b/programs/jrnl/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "jrnl" +name = "j" version = "0.1.0" edition = "2021" @@ -15,3 +15,4 @@ petgraph = "0.6.4" ratatui = "0.26.2" temp-file = "0.1.8" termsize = "0.1.6" +inquire = "0.7.5" diff --git a/programs/jrnl/src/commands/add_entry.rs b/programs/jrnl/src/commands/add_entry.rs index 8dd1b92..c7f78db 100644 --- a/programs/jrnl/src/commands/add_entry.rs +++ b/programs/jrnl/src/commands/add_entry.rs @@ -6,6 +6,7 @@ use std::{ process::Command, }; +use inquire::Text; use temp_file::{TempFile, TempFileBuilder}; use crate::md::{Entry, ToMd}; @@ -17,7 +18,7 @@ pub fn add_entry(path: PathBuf, title: Option) -> io::Result<()> { std::process::exit(1); } - let title = prompt("Title")?; + let title = Text::new("Title").prompt().unwrap(); let tmp = TempFileBuilder::new() .suffix(".jrnl-entry.md") @@ -57,12 +58,3 @@ pub fn add_entry(path: PathBuf, title: Option) -> io::Result<()> { Ok(()) } - -fn prompt(title: &str) -> io::Result { - print!("{}: ", title); - let _ = io::stdout().flush(); - let mut buf = String::new(); - let stdin = io::stdin(); - stdin.read_line(&mut buf)?; - Ok(buf) -} From a3777bd73a1e70f8ab7379ad17aa4e2dde0b6f5a Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 May 2024 21:33:30 +0200 Subject: [PATCH 04/15] change editor timeout to 200ms --- modules/shell/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 5055a35..7f025b3 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -48,7 +48,7 @@ "file-encoding" "file-type" ]; - idle-timeout = 30; + idle-timeout = 200; indent-guides = { render = true; character = "│"; From e64935cf002212dd5ba341099b71e8ae3e521aec Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 May 2024 21:49:11 +0200 Subject: [PATCH 05/15] fix crane warnings --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index a72ed00..89bffb8 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,8 @@ # cargoLock.lockFile = ./programs/jrnl/Cargo.lock; # }; s10e-jrnl = crane-lib.buildPackage { + pname = "s10e-bs"; + version = "0.0.1"; src = crane-lib.cleanCargoSource (crane-lib.path ./.); }; }; From 093fe30d752f4bd52554888e2f7c457c97ab011a Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 May 2024 21:49:22 +0200 Subject: [PATCH 06/15] fix unused markdown uses --- programs/jrnl/src/md.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/jrnl/src/md.rs b/programs/jrnl/src/md.rs index 8453c77..234666e 100644 --- a/programs/jrnl/src/md.rs +++ b/programs/jrnl/src/md.rs @@ -1,5 +1,4 @@ use chrono::{DateTime, FixedOffset}; -use markdown::{Block, Span}; use std::convert::identity; pub trait ToMd { From 81246671df3acc577f60f3c837624d9e07287336 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 11:11:13 +0200 Subject: [PATCH 07/15] setup sway --- modules/desktop-environment/home/default.nix | 1 + .../desktop-environment/home/sway/default.nix | 166 ++++++++++++++++++ modules/desktop/x.nix | 9 +- 3 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 modules/desktop-environment/home/sway/default.nix diff --git a/modules/desktop-environment/home/default.nix b/modules/desktop-environment/home/default.nix index 6891b94..9ea2526 100644 --- a/modules/desktop-environment/home/default.nix +++ b/modules/desktop-environment/home/default.nix @@ -6,6 +6,7 @@ ./compositing.nix ./panels ./xmonad + ./sway ]; }; } diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix new file mode 100644 index 0000000..d7f849e --- /dev/null +++ b/modules/desktop-environment/home/sway/default.nix @@ -0,0 +1,166 @@ +{ + pkgs, + lib, + config, + ... +}: { + programs.wofi.enable = true; + wayland.windowManager.sway = { + enable = true; + config = { + modes = { + resize = { + Down = "resize grow height 10 px"; + Escape = "mode default"; + Left = "resize shrink width 10 px"; + Return = "mode default"; + Right = "resize grow width 10 px"; + Up = "resize shrink height 10 px"; + h = "resize shrink width 10 px"; + j = "resize grow height 10 px"; + k = "resize shrink height 10 px"; + l = "resize grow width 10 px"; + }; + }; + output = { + "*" = { + bg = "${../xmonad/wallpaper/wallpaper.jpg} fill"; + }; + }; + input = { + "*" = { + xkb_layout = "us"; + xkb_variant = "altgr-intl"; + }; + }; + menu = "wofi -d"; + modifier = "Mod4"; + keybindings = with { + #mod = config.xsession.windowManager.i3.config.modifier; + # mod = "Mod1"; + mod = config.wayland.windowManager.sway.config.modifier; + }; + lib.mkOptionDefault { + # switch window focus + "${mod}+h" = "focus left"; + "${mod}+j" = "focus down"; + "${mod}+k" = "focus up"; + "${mod}+l" = "focus right"; + # move windows + "${mod}+Shift+h" = "move left"; + "${mod}+Shift+j" = "move down"; + "${mod}+Shift+k" = "move up"; + "${mod}+Shift+l" = "move right"; + # layout shit + "${mod}+shift+semicolon" = "split h"; + "${mod}+semicolon" = "split v"; + "${mod}+f" = "fullscreen toggle"; + "${mod}+Shift+w" = "layout tabbed"; + "${mod}+e" = "layout toggle split"; + "${mod}+Shift+space" = "floating toggle"; + # focus parents/children + # "${mod}+Shift+a" = "focus parent"; + # "${mod}+Shift+c" = "focus child"; + # screenshot + # "${mod}+w" = "exec window-screenshot.sh"; + # "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots"; + # "${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots"; + # "${mod}+t" = "exec ocr-screenshot.sh"; + + # rofi fuckery + "${mod}+d" = "exec wofi -S drun --allow-images"; + "${mod}+i" = "exec rofimoji --selector wofi -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; + # TODO: wayland + # "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../../other/rofi-themes/applauncher.rasi}"; + # "${mod}+space" = "exec --no-startup-id rofi -show combi -combi-show window#run -modes combi -theme ${../../other/rofi-themes/applauncher.rasi}"; + # "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; + # "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../../other/rofi-themes/applauncher.rasi}"; + # "${mod}+m" = "exec --no-startup-id menu-qalc"; + + # "${mod}+o" = "exec --no-startup-id rofi -show searchwolf -modes \"searchwolf:${searchwolf.outPath}/bin/searchwolf\""; + + # audio + "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status"; + "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status"; + "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status"; + "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status"; + + "XF86AudioNext" = "exec playerctl next"; + "XF86AudioPrev" = "exec playerctl previous"; + "XF86AudioPause" = "exec playerctl pause"; + "XF86AudioPlay" = "exec playerctl play"; + "XF86AudioStop" = "exec playerctl stop"; + + "XF86MonBrightnessUp" = "exec brightnessctl set 5%+"; + "XF86MonBrightnessDown" = "exec brightnessctl set 5%-"; + + "XF86KbdBrightnessUp" = "exec brillo -kA 10.0"; + "XF86KbdBrightnessDown" = "exec brillo -kU 10.0"; + + # macros + # "${mod}+q" = "exec em-record.sh"; + # "${mod}+p" = "exec em-play.sh"; + # "${mod}+Shift+p" = "exec em-play-loop.sh"; + + # permaclip + # "${mod}+c" = "exec rofi -show register -modes \"register:${pc-set.outPath}/bin/pc-set.sh\" -theme gruvbox-dark"; + # "${mod}+v" = "exec rofi -show register -modes \"register:${pc-get.outPath}/bin/pc-get.sh\" -theme gruvbox-dark"; + }; + fonts = { + names = ["Atkinson Hyperlegible"]; + style = "Regular"; + size = 9.0; + }; + gaps = { + #top = 24; + inner = 15; + outer = 0; + smartGaps = true; + smartBorders = "on"; + }; + colors = { + background = "#1d2021"; + focused = { + background = "#282828"; + border = "#504945"; + childBorder = "#7c6f64"; + indicator = "#504945"; + text = "#ebdbb2"; + }; + focusedInactive = { + background = "#1d2021"; + border = "#504945"; + childBorder = "#665c54"; + indicator = "#664c54"; + text = "#d5c4a1"; + }; + placeholder = { + background = "#1d2021"; + border = "#00ff00"; + childBorder = "#504945"; + indicator = "#504945"; + text = "#928374"; + }; + unfocused = { + background = "#1d2021"; + border = "#3c3836"; + childBorder = "#504945"; + indicator = "#504945"; + text = "#bdae93"; + }; + urgent = { + background = "#9d0006"; + border = "#cc241d"; + childBorder = "#3c3836"; + indicator = "#fb4943"; + text = "#ebdbb2"; + }; + }; + + window = { + border = 2; + titlebar = true; + }; + }; + }; +} diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix index 50f9666..1bd4586 100644 --- a/modules/desktop/x.nix +++ b/modules/desktop/x.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { services.xserver = { enable = true; @@ -8,6 +8,10 @@ displayManager = { gdm.enable = true; + sessionPackages = [ + pkgs.sway + ]; + gdm.autoLogin.delay = 5; }; windowManager.xmonad = { @@ -15,5 +19,8 @@ }; }; + security.polkit.enable = true; + programs.sway.enable = true; + services.displayManager.defaultSession = "none+xmonad"; } From 8c81b94e47184c35250761bf0c4b4be4b9e24079 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 13:23:20 +0200 Subject: [PATCH 08/15] helix inline diags --- flake.nix | 14 +++++++++++--- modules/shell/helix.nix | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 89bffb8..52c8181 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,13 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; + helix-inline-diags = { + url = "github:pascalkuthe/helix/inline-diagnostics"; + inputs = { + crane.follows = "crane"; + nixpkgs.follows = "nixpkgs"; + }; + }; lix = { url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; flake = false; @@ -40,6 +47,7 @@ nixpkgs, nixpkgs-stable, nixpkgs-unstable-small, + helix-inline-diags, lix-module, home-manager, nixos-hardware, @@ -93,7 +101,7 @@ nixosConfigurations = { monosodium-glutamate-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags; }; system = "x86_64-linux"; modules = [ @@ -118,7 +126,7 @@ }; catbook-j = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags; }; system = "x86_64-linux"; modules = [ @@ -143,7 +151,7 @@ }; potatobook-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small rs-programs lix-module; + inherit inputs pkgs-unstable-small rs-programs lix-module helix-inline-diags; }; system = "x86_64-linux"; modules = [ diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 7f025b3..36d3e41 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + helix-inline-diags, + ... +}: { home-manager.users.jade = {pkgs, ...}: { home = { sessionVariables.EDITOR = "hx"; @@ -12,7 +16,7 @@ }; programs.helix = { enable = true; - package = pkgs.helix; + package = helix-inline-diags.outputs.packages."x86_64-linux".default; settings = { theme = "gruvbox"; editor = { @@ -22,6 +26,11 @@ cursorline = true; auto-save = true; auto-format = true; + end-of-line-diagnostics = "hint"; + inline-diagnostics = { + cursor-line = "hint"; + other-lines = "error"; + }; lsp = { display-messages = true; display-inlay-hints = true; @@ -48,7 +57,7 @@ "file-encoding" "file-type" ]; - idle-timeout = 200; + idle-timeout = 50; indent-guides = { render = true; character = "│"; From e3767b54413b82c790724b81a45ca9587908fb74 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 13:24:47 +0200 Subject: [PATCH 09/15] fix hw key --- common.nix | 1 + modules/desktop-environment/home/default.nix | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/common.nix b/common.nix index 128ecb2..2d1320d 100644 --- a/common.nix +++ b/common.nix @@ -115,6 +115,7 @@ with builtins; { mtr.enable = true; }; + hardware.gpgSmartcards.enable = true; time.timeZone = "Europe/Berlin"; home-manager.users.jade = { diff --git a/modules/desktop-environment/home/default.nix b/modules/desktop-environment/home/default.nix index 9ea2526..b9f6429 100644 --- a/modules/desktop-environment/home/default.nix +++ b/modules/desktop-environment/home/default.nix @@ -8,5 +8,11 @@ ./xmonad ./sway ]; + + services.gpg-agent = { + enable = true; + enableNushellIntegration = true; + enableSshSupport = true; + }; }; } From a20ee22543e65479fa32b0dfacee57ee384ff0c4 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 13:25:10 +0200 Subject: [PATCH 10/15] fix home manager search alias --- modules/desktop/firefox.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/desktop/firefox.nix b/modules/desktop/firefox.nix index d28dc70..37c5cd6 100644 --- a/modules/desktop/firefox.nix +++ b/modules/desktop/firefox.nix @@ -82,12 +82,16 @@ "Home manager Options" = { urls = [ { - template = "https://mipmip.github.io/home-manager-option-search/"; + template = "https://home-manager-options.extranix.com/"; params = [ { name = "query"; value = "{searchTerms}"; } + { + name = "release"; + value = "master"; + } ]; } ]; From 11d200f60bcc50954198c925964b7a6a5db98de9 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 13:25:51 +0200 Subject: [PATCH 11/15] more sway stuff --- modules/desktop-environment/home/sway/default.nix | 10 ++++++++++ modules/desktop/x.nix | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index d7f849e..0aafe8e 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -5,8 +5,17 @@ ... }: { programs.wofi.enable = true; + programs.swaylock.enable = true; + wayland.windowManager.sway = { enable = true; + systemd = { + enable = true; + }; + wrapperFeatures = { + base = true; + gtk = true; + }; config = { modes = { resize = { @@ -22,6 +31,7 @@ l = "resize grow width 10 px"; }; }; + terminal = "kitty"; output = { "*" = { bg = "${../xmonad/wallpaper/wallpaper.jpg} fill"; diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix index 1bd4586..8ea697b 100644 --- a/modules/desktop/x.nix +++ b/modules/desktop/x.nix @@ -20,7 +20,8 @@ }; security.polkit.enable = true; - programs.sway.enable = true; + # programs.sway.enable = true; - services.displayManager.defaultSession = "none+xmonad"; + # services.displayManager.defaultSession = "none+xmonad"; + services.displayManager.defaultSession = "sway"; } From b3fe297a4a0540b5d01f6b348a8825b32b07dd27 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 13:26:05 +0200 Subject: [PATCH 12/15] add logseq --- modules/desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 7f91df6..152db4e 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -169,6 +169,8 @@ in mupdf inotify-tools + + logseq ]; xsession = { enable = true; From 5a1252da4b5f021106d82c4603432500dc92cd85 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 13:26:34 +0200 Subject: [PATCH 13/15] update nushell stuff --- common.nix | 3 ++- modules/shell/nu.nix | 5 +++++ other/config.nu | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/common.nix b/common.nix index 2d1320d..dafa9d7 100644 --- a/common.nix +++ b/common.nix @@ -116,6 +116,7 @@ with builtins; { }; hardware.gpgSmartcards.enable = true; + time.timeZone = "Europe/Berlin"; home-manager.users.jade = { @@ -156,5 +157,5 @@ with builtins; { algorithm = "zstd"; }; - users.defaultUserShell = pkgs.nushellFull; + users.defaultUserShell = pkgs.nushell; } diff --git a/modules/shell/nu.nix b/modules/shell/nu.nix index 24d3e6a..f338d7e 100644 --- a/modules/shell/nu.nix +++ b/modules/shell/nu.nix @@ -11,6 +11,11 @@ }; home.packages = [ pkgs.pueue + pkgs.nushellPlugins.net + pkgs.nushellPlugins.query + pkgs.nushellPlugins.gstat + pkgs.nushellPlugins.polars + pkgs.nushellPlugins.formats ]; programs.nushell = { enable = true; diff --git a/other/config.nu b/other/config.nu index 0f359b5..9435b28 100644 --- a/other/config.nu +++ b/other/config.nu @@ -42,6 +42,7 @@ let dark_theme = { shape_directory: cyan shape_external: cyan shape_externalarg: green_bold + shape_external_resolved: light_cyan_bold shape_filepath: cyan shape_flag: blue_bold shape_float: purple_bold @@ -238,7 +239,36 @@ $env.config = { use_ansi_coloring: true bracketed_paste: true # enable bracketed paste, currently useless on windows edit_mode: vi # emacs, vi - shell_integration: true # enables terminal shell integration. Off by default, as some terminals have issues with this. + shell_integration: { + # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title + osc2: true + # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory + osc7: true + # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8 + osc8: true + # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal + osc9_9: false + # osc133 is several escapes invented by Final Term which include the supported ones below. + # 133;A - Mark prompt start + # 133;B - Mark prompt end + # 133;C - Mark pre-execution + # 133;D;exit - Mark execution finished with exit code + # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is + osc133: true + # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features + # 633;A - Mark prompt start + # 633;B - Mark prompt end + # 633;C - Mark pre-execution + # 633;D;exit - Mark execution finished with exit code + # 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce + # 633;P;Cwd= - Mark the current working directory and communicate it to the terminal + # and also helps with the run recent menu in vscode + osc633: false + # reset_application_mode is escape \x1b[?1l and was added to help ssh work better + reset_application_mode: true + } + use_kitty_protocol: false + highlight_resolved_externals: true render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt. hooks: { @@ -781,6 +811,12 @@ def start_zellij [] { start_zellij +# plugin add nu_plugin_net +# plugin add nu_plugin_gstat +# plugin add nu_plugin_query +# plugin add nu_plugin_polars +# plugin add nu_plugin_formats + def nsp [ ...programs: string ] { From f05b49fa81c8015a303093210b8e86ac51a7d067 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 12 Jun 2024 13:27:57 +0200 Subject: [PATCH 14/15] flake.lock: Update --- flake.lock | 137 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 111 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index c245eab..1b02b89 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714864355, - "narHash": "sha256-uXNW6bapWFfkYIkK1EagydSrFMqycOYEDSq75GmUpjk=", + "lastModified": 1718078026, + "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", "owner": "ipetkov", "repo": "crane", - "rev": "442a7a6152f49b907e73206dc8e1f46a61e8e873", + "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1714976745, - "narHash": "sha256-SAYU6uaVcUmckp/RFxkndz7u7eX1D69piTIMmAAop6Y=", + "lastModified": 1717827974, + "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=", "owner": "nix-community", "repo": "fenix", - "rev": "a291b6ad30f4ec949e6c98dde43d73d2946515c3", + "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8", "type": "github" }, "original": { @@ -45,6 +45,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -74,6 +92,32 @@ "type": "github" } }, + "helix-inline-diags": { + "inputs": { + "crane": [ + "crane" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1717871542, + "narHash": "sha256-eUB9gt3Hva7atNOv/Vel1bchD/9Pziz0C/r9K0vh+qQ=", + "owner": "pascalkuthe", + "repo": "helix", + "rev": "418ac237bf1e162b866a873d6cd33bb69f5d1bb4", + "type": "github" + }, + "original": { + "owner": "pascalkuthe", + "ref": "inline-diagnostics", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -81,11 +125,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1717931644, + "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", "type": "github" }, "original": { @@ -113,7 +157,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -123,11 +167,11 @@ ] }, "locked": { - "lastModified": 1714868057, - "narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=", + "lastModified": 1717647344, + "narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=", "ref": "refs/heads/main", - "rev": "e31baf57680bab449ab5b40179cc4a08a99f5314", - "revCount": 62, + "rev": "4e25f1ab68f2270f9cff59216056c21073db0164", + "revCount": 87, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -167,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -182,11 +226,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1714782413, - "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", + "lastModified": 1718060059, + "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "651b4702e27a388f0f18e1b970534162dec09aff", + "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", "type": "github" }, "original": { @@ -197,11 +241,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1715010189, - "narHash": "sha256-VG/ax2TLmsF0G8M3Q/lE0P7U/pzky8NScim8ZGmIfAY=", + "lastModified": 1718083092, + "narHash": "sha256-EQsPXycAbmby4meQUNLYfFaGOiqz2J9AlwFRV4UiHnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95269ee8dbc9daacad586e8ad87567369a7e1042", + "rev": "aa1ebdaf49a606e21c06e0f6ed7aece9a41831c3", "type": "github" }, "original": { @@ -214,6 +258,7 @@ "inputs": { "crane": "crane", "fenix": "fenix", + "helix-inline-diags": "helix-inline-diags", "home-manager": "home-manager", "lix": "lix", "lix-module": "lix-module", @@ -227,11 +272,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1714936835, - "narHash": "sha256-M+PpgfRMBfHo8Jb2ou/s3maAZbps0XnuHXQU9Hv9vL0=", + "lastModified": 1717583671, + "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "c4618fe14d39992fbbb85c2d6cad028a232c13d2", + "rev": "48bbdd6a74f3176987d5c809894ac33957000d19", "type": "github" }, "original": { @@ -241,6 +286,31 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "helix-inline-diags", + "flake-utils" + ], + "nixpkgs": [ + "helix-inline-diags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709604635, + "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -255,6 +325,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", From ee44af814e6eafc5006e7c34ade4fe5253b25581 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 17 Jun 2024 17:22:03 +0200 Subject: [PATCH 15/15] make swaylock work --- hosts/catbook-j/configuration.nix | 2 ++ modules/desktop/x.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index a380743..79de2e1 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -28,6 +28,8 @@ }; }; + security.pam.services.swaylock = {}; + hardware.usb-modeswitch.enable = true; systemd.services."ModemManager".enable = true; systemd.services."ModemManager".wants = ["NetworkManager.service"]; diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix index 8ea697b..00178fb 100644 --- a/modules/desktop/x.nix +++ b/modules/desktop/x.nix @@ -20,7 +20,7 @@ }; security.polkit.enable = true; - # programs.sway.enable = true; + programs.sway.enable = true; # services.displayManager.defaultSession = "none+xmonad"; services.displayManager.defaultSession = "sway";