From 76aff0d0e4550de539108f0a2a72cc65f5347759 Mon Sep 17 00:00:00 2001 From: xenia Date: Fri, 27 Oct 2023 23:40:45 +0200 Subject: [PATCH] Add fox layout --- flake.lock | 216 +++++++++++++++++++++++++++++++++++++++++--- flake.nix | 8 +- nixos/graphical.nix | 25 +++-- 3 files changed, 227 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 45b90752..e0d80426 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,44 @@ { "nodes": { + "agda": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "rachel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696540558, + "narHash": "sha256-fqYyjgOFQrU4ryGcLyz5gMYMdPk1P24ra7kQiUrbilg=", + "owner": "agda", + "repo": "agda", + "rev": "f42acb696e43d382639f04f869e9a99ab36a91c6", + "type": "github" + }, + "original": { + "owner": "agda", + "ref": "v2.6.4", + "repo": "agda", + "type": "github" + } + }, + "agda-stdlib-source": { + "flake": false, + "locked": { + "lastModified": 1693492688, + "narHash": "sha256-oO27n/Q+IGPVAaEbOI8YwjerrhvA5rLV+gH6fGDwUIs=", + "owner": "agda", + "repo": "agda-stdlib", + "rev": "f77a02ab6933fadbd42de3959545e91122934342", + "type": "github" + }, + "original": { + "owner": "agda", + "repo": "agda-stdlib", + "type": "github" + } + }, "ansi-utils": { "inputs": { "flake-utils": "flake-utils", @@ -21,6 +60,47 @@ "url": "https://git@githug.xyz/xenia/ansi-utils" } }, + "cornelis": { + "inputs": { + "agda": [ + "rachel", + "agda" + ], + "agda-stdlib-source": "agda-stdlib-source", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1694540816, + "narHash": "sha256-pUHGjxtFkgTO0Ewovc4CEKG2kmJCXxJBDxOcxgJs9Ds=", + "owner": "isovector", + "repo": "cornelis", + "rev": "d7ec58bcef67b1234aa861a706bd402849c8b6e3", + "type": "github" + }, + "original": { + "owner": "isovector", + "repo": "cornelis", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -58,9 +138,42 @@ } }, "flake-utils_3": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -75,9 +188,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_6": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -100,11 +213,11 @@ ] }, "locked": { - "lastModified": 1697611555, - "narHash": "sha256-8nYMduRQfGSQJr2cDMyodsuGlRcJAy0Ko8K4KkjurP8=", + "lastModified": 1698392685, + "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "05649393ac1f34980a5cf6a6e89de77626c9182b", + "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", "type": "github" }, "original": { @@ -113,6 +226,28 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "rachel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "07682fff75d41f18327a871088d20af2710d4744", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", + "repo": "home-manager", + "type": "github" + } + }, "kak": { "inputs": { "flake-utils": "flake-utils_2", @@ -141,11 +276,11 @@ ] }, "locked": { - "lastModified": 1696360011, - "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", + "lastModified": 1698429334, + "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", + "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7", "type": "github" }, "original": { @@ -156,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -170,6 +305,45 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1694062546, + "narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "rachel": { + "inputs": { + "agda": "agda", + "cornelis": "cornelis", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698442363, + "narHash": "sha256-MoAnALR+r/+tuWNm2DqHUHhQMTrq5jNSgwPgQ4/vIKs=", + "ref": "refs/heads/master", + "rev": "78a50f078d7efda240c2ef17f51a50f821dbe238", + "revCount": 62, + "type": "git", + "url": "https://git@githug.xyz/rachel/nixos-config" + }, + "original": { + "type": "git", + "url": "https://git@githug.xyz/rachel/nixos-config" + } + }, "root": { "inputs": { "ansi-utils": "ansi-utils", @@ -177,6 +351,7 @@ "kak": "kak", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", + "rachel": "rachel", "unambig-path": "unambig-path", "unispect": "unispect" } @@ -241,9 +416,24 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unambig-path": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -264,7 +454,7 @@ }, "unispect": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index a4c0230e..75e6a581 100644 --- a/flake.nix +++ b/flake.nix @@ -29,9 +29,13 @@ url = "git+https://git@githug.xyz/xenia/unambig-path"; inputs.nixpkgs.follows = "nixpkgs"; }; + rachel = { + url = "git+https://git@githug.xyz/rachel/nixos-config"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path }: + outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, rachel }: let xdg-runtime-dir = "/tmp/xdg-rt"; @@ -57,7 +61,7 @@ }; mkNixOsBase = opts: import ./nixos/base.nix opts; - mkNixOsGraphical = opts: import ./nixos/graphical.nix opts; + mkNixOsGraphical = opts: import ./nixos/graphical.nix (opts // { fox-layout = rachel.keyboardLayouts.fox; }); mkNixOsNetworking = opts: import ./nixos/networking.nix opts; in { homeConfigurations."xenia@Joe-Bidens-MacBook-Pro.local" = diff --git a/nixos/graphical.nix b/nixos/graphical.nix index ef30bdbf..8852a783 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -1,17 +1,28 @@ { pkgs, + fox-layout, background-image ? "pan-wire-3.png", ... }: { # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.desktopManager.xfce.enable = true; - services.xserver.displayManager = { - defaultSession = "xfce"; - lightdm = { - background = ../backgrounds/${background-image}; - greeters.slick.enable = true; + + services.xserver = { + enable = true; + desktopManager.xfce.enable = true; + displayManager = { + defaultSession = "xfce"; + lightdm = { + background = ../backgrounds/${background-image}; + greeters.slick.enable = true; + }; + }; + + layout = "fox"; + extraLayouts.fox = { + description = "Layout suitable to be used by a fox"; + languages = ["se"]; + symbolsFile = fox-layout; }; };