From 62d9f9ef411ab857fd938a847d56854e1e4ebf09 Mon Sep 17 00:00:00 2001 From: tristan Date: Mon, 28 Oct 2024 12:24:31 +0000 Subject: [PATCH] nixbook: update, tweaks --- flake.lock | 226 +++++++++++++++++++------------- flake.nix | 8 +- home/default.nix | 1 - home/desktop/cosmic/default.nix | 3 + home/programs/git.nix | 1 + home/workstation.nix | 3 +- lib/mkconf.nix | 9 +- lib/nixvim.nix | 27 +++- nixos/modules/work.nix | 2 + nixos/programs/cosmic.nix | 2 +- nixos/workstation.nix | 2 +- 11 files changed, 182 insertions(+), 102 deletions(-) diff --git a/flake.lock b/flake.lock index e1826e6..1d82a64 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -278,31 +278,10 @@ "type": "github" } }, - "home-manager": { + "hm-cosmic": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727346017, - "narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c124568e1054a62c20fbe036155cc99237633327", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-cosmic": { - "inputs": { - "home-manager": "home-manager_2", - "home-manager-cosmic": "home-manager-cosmic_2" + "home-manager": "home-manager", + "home-manager-cosmic": "home-manager-cosmic" }, "locked": { "lastModified": 1729637091, @@ -319,7 +298,26 @@ "type": "github" } }, - "home-manager-cosmic_2": { + "home-manager": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1729551526, + "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-cosmic": { "inputs": { "nixpkgs": "nixpkgs_2" }, @@ -340,14 +338,16 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1729551526, - "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", + "lastModified": 1729894599, + "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", + "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb", "type": "github" }, "original": { @@ -365,11 +365,11 @@ ] }, "locked": { - "lastModified": 1726985855, - "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=", + "lastModified": 1729894599, + "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=", "owner": "nix-community", "repo": "home-manager", - "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d", + "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb", "type": "github" }, "original": { @@ -399,6 +399,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -407,11 +435,11 @@ ] }, "locked": { - "lastModified": 1727003835, - "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", + "lastModified": 1729826725, + "narHash": "sha256-w3WNlYxqWYsuzm/jgFPyhncduoDNjot28aC8j39TW0U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", + "rev": "7840909b00fbd5a183008a6eb251ea307fe4a76e", "type": "github" }, "original": { @@ -423,18 +451,16 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727314564, - "narHash": "sha256-UE98O6EQYUiDp7rypkBfJG0XSz0c5FxkslyP+7Gskt8=", + "lastModified": 1729906530, + "narHash": "sha256-9hZQO3Ll2tP2Jw+msNuHg+Sa4l7aqJ0TMjx5DH3fUZQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "f2aa34f521da1d6335301fc1b58dde8ed779d632", + "rev": "ba83685fb3f4422dfcf3c01a0b3a9dc4b803714d", "type": "github" }, "original": { @@ -461,11 +487,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727129439, - "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -477,11 +503,26 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -509,26 +550,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -569,11 +611,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727328717, - "narHash": "sha256-tGEVv5mFs38m6+60fNKlZn/6ucoOotfwn9FikXiYSlk=", + "lastModified": 1729945956, + "narHash": "sha256-nWRynowHjpRsDK6uf+VE6fz7/Wk80uRiAV2NQssGBH8=", "owner": "nix-community", "repo": "nixvim", - "rev": "2ab8751b8be55accb78ca0ca58f1f4ff387001d7", + "rev": "2ef948ed8ccf3c93f8caafa93cddca85df5783e9", "type": "github" }, "original": { @@ -585,17 +627,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1726995581, - "narHash": "sha256-lgsE/CTkZk9OIiFGEIrxXZQ7Feiv41dqlN7pEfTdgew=", + "lastModified": 1729809697, + "narHash": "sha256-r3jMdRyG1ozydtmaze2Ah4OL81Y7567kbWvvME8Js/Q=", "owner": "NuschtOS", "repo": "search", - "rev": "3b7dd61b365ca45380707453758a45f2e9977be3", + "rev": "b35c0b1cbbcc42161c07c77419c2801d461f1401", "type": "github" }, "original": { @@ -606,10 +649,14 @@ }, "root": { "inputs": { - "home-manager": "home-manager", - "home-manager-cosmic": "home-manager-cosmic", + "hm-cosmic": "hm-cosmic", + "home-manager": "home-manager_2", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "sops-nix": "sops-nix", "stylix": "stylix" @@ -623,11 +670,11 @@ ] }, "locked": { - "lastModified": 1727231386, - "narHash": "sha256-XLloPtQHKk/Tdt8t8zIb+JhmunlH3YB9Jz8RTlQ3N/4=", + "lastModified": 1729823394, + "narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b5f76c3b09a8194889f5328a480fbea1a9115518", + "rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f", "type": "github" }, "original": { @@ -639,14 +686,14 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1729931925, + "narHash": "sha256-3tjYImjVzsSM4sU+wTySF94Yop1spI/XomMBEpljKvQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "b2211d1a537136cc1d0d5c0af391e8712016b34e", "type": "github" }, "original": { @@ -672,11 +719,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1727355527, - "narHash": "sha256-qFSPHeImI00fBzGTA94D66HMD+fJDkuz04WHp2Sg8eA=", + "lastModified": 1729963473, + "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", "owner": "danth", "repo": "stylix", - "rev": "993fcabd83d1e0ee5ea038b87041593cc73c1ebe", + "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", "type": "github" }, "original": { @@ -734,16 +781,17 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, @@ -771,11 +819,11 @@ ] }, "locked": { - "lastModified": 1726734507, - "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 29e8252..76e33fe 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,19 @@ { description = "A flake using my config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + # nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.follows = "nixos-cosmic/nixpkgs"; + nixpkgs-stable.url = "nixpkgs/nixos-24.05"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager-cosmic.url = "github:tristanbeedell/hm-cosmic/master"; + hm-cosmic.url = "github:tristanbeedell/hm-cosmic/master"; stylix.url = "github:danth/stylix"; sops-nix.url = "github:Mic92/sops-nix"; nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { url = "github:nix-community/nixvim"; diff --git a/home/default.nix b/home/default.nix index 6b72153..0c5f5ff 100644 --- a/home/default.nix +++ b/home/default.nix @@ -37,7 +37,6 @@ yt-dlp fastfetch tree - ansible ytfzf ]; diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix index b287c5e..bcfa074 100644 --- a/home/desktop/cosmic/default.nix +++ b/home/desktop/cosmic/default.nix @@ -21,6 +21,8 @@ in { Super.Shift. "l" = Actions.Move "Right"; Super.Shift. "j" = Actions.Move "Down"; Super.Shift. "k" = Actions.Move "Up"; + Super.Shift. "Right" = Actions.MoveToNextWorkspace; + Super.Shift. "Left" = Actions.MoveToPreviousWorkspace; Super. "1" = Actions.Workspace 1; Super. "2" = Actions.Workspace 2; Super. "3" = Actions.Workspace 3; @@ -81,6 +83,7 @@ in { focus_follows_cursor = true; focus_follows_cursor_delay = 0; cursor_follows_focus = true; + descale_xwayland = true; workspaces = { workspace_layout = "Horizontal"; }; diff --git a/home/programs/git.nix b/home/programs/git.nix index 2ff8837..1e9f122 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -8,6 +8,7 @@ enable = true; extraConfig = { rerere.enabled = true; + rebase.updateRefs = true; }; aliases = { ui = "!lazygit"; diff --git a/home/workstation.nix b/home/workstation.nix index 481408b..125e657 100644 --- a/home/workstation.nix +++ b/home/workstation.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + stable-pkgs, ... }: { imports = [ @@ -28,7 +29,7 @@ playerctl quickemu devenv - logseq + stable-pkgs.logseq ]; services.udiskie = { diff --git a/lib/mkconf.nix b/lib/mkconf.nix index e8b9d34..b593419 100644 --- a/lib/mkconf.nix +++ b/lib/mkconf.nix @@ -9,9 +9,15 @@ home-modules ? [], }: let inherit (inputs) home-manager nixpkgs sops-nix nixvim; + stable-pkgs = import inputs.nixpkgs-stable { + inherit system; + config.permittedInsecurePackages = [ + "electron-27.3.11" + ]; + }; in nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; + specialArgs = {inherit inputs stable-pkgs;}; inherit system; @@ -25,6 +31,7 @@ in useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "bak"; + extraSpecialArgs = {inherit stable-pkgs;}; users.${user}.imports = home-modules ++ [ diff --git a/lib/nixvim.nix b/lib/nixvim.nix index f98f4a0..106837f 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -10,6 +10,10 @@ ${cmd} end''; in { + colorschemes.base16 = { + enable = true; + colorscheme = "gruvbox-dark-hard"; + }; globals = { mapleader = " "; }; @@ -21,10 +25,10 @@ in { expandtab = true; smartindent = true; scrolloff = 4; + smoothscroll = true; undofile = true; undodir = lua ''vim.fn.expand("$HOME/.local/share/nvim/undo")''; - list = true; listchars = builtins.concatStringsSep "," [ "tab: >" @@ -36,7 +40,10 @@ in { foldlevel = 2; }; - extraPlugins = [(pkgs.vimPlugins.actions-preview-nvim)]; + extraPlugins = [ + (pkgs.vimPlugins.actions-preview-nvim) + (pkgs.vimPlugins.vimwiki) + ]; extraConfigLua = '' require("actions-preview").setup { highlight_command = { @@ -214,7 +221,7 @@ in { autoCmd = [ { event = "BufWritePre"; - pattern = "*"; + pattern = "*.go"; # https://github.com/golang/tools/blob/master/gopls/doc/vim.md#imports-and-formatting callback = luaFunc '' local params = vim.lsp.util.make_range_params() @@ -269,7 +276,7 @@ in { lsp = { enable = true; servers = { - ts-ls.enable = true; + ts_ls.enable = true; nixd = { enable = true; settings = { @@ -281,6 +288,7 @@ in { }; yamlls.enable = true; gopls.enable = true; + ansiblels.enable = true; }; keymaps = { lspBuf = { @@ -375,7 +383,16 @@ in { }; }; - oil.enable = true; + oil = { + enable = true; + settings = { + keymaps = { + "" = "actions.refresh"; + "zh" = "actions.toggle_hidden"; + }; + view_options.show_hidden = true; + }; + }; ts-autotag.enable = true; guess-indent.enable = true; }; diff --git a/nixos/modules/work.nix b/nixos/modules/work.nix index 24d9b2d..f22246a 100644 --- a/nixos/modules/work.nix +++ b/nixos/modules/work.nix @@ -12,10 +12,12 @@ in { "vscode" "steam-run" "postman" + "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623 ]; nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" # required for mongodb + "electron-27.3.11" ]; networking = { diff --git a/nixos/programs/cosmic.nix b/nixos/programs/cosmic.nix index 140334e..3f1ccb9 100644 --- a/nixos/programs/cosmic.nix +++ b/nixos/programs/cosmic.nix @@ -14,7 +14,7 @@ services.displayManager.cosmic-greeter.enable = true; services.system76-scheduler.enable = true; home-manager.users.${config.user}.imports = [ - (inputs.home-manager-cosmic.homeManagerModules.cosmic) + (inputs.hm-cosmic.homeManagerModules.cosmic) ../../home/desktop/cosmic/. ]; } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index d358c77..b14d2a5 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -52,7 +52,7 @@ useImage = true; }; nixvim = { - transparentBackground.main = true; + enable = false; }; }; };