diff --git a/flake.lock b/flake.lock index b4418ac..86c628c 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ }, "crane": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -695,16 +695,16 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.3", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -791,7 +791,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable_3", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, @@ -1026,6 +1026,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1761468971, "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", @@ -1059,11 +1075,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754243818, - "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", + "lastModified": 1731919951, + "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", + "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "type": "github" }, "original": { @@ -1280,14 +1296,15 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -1376,11 +1393,11 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 50ab6f7..82b74f6 100644 --- a/flake.nix +++ b/flake.nix @@ -203,7 +203,7 @@ type = "github"; owner = "nix-community"; repo = "lanzaboote"; - ref = "v0.4.3"; + ref = "v0.4.2"; }; nix-doom = { diff --git a/home/modules/programs/fish.nix b/home/modules/programs/fish.nix index d08ea3f..d7a8252 100644 --- a/home/modules/programs/fish.nix +++ b/home/modules/programs/fish.nix @@ -43,9 +43,6 @@ in }; shellInitLast = # fish '' - if test -e ~/.config/guix/current/bin/guix - fish_add_path -pPm ~/.config/guix/current/bin - end if test -d ~/.guix-profile set -gx GUIX_PROFILE ~/.guix-profile if test -f $GUIX_PROFILE/etc/profile diff --git a/nixos/modules/programs/guix.nix b/nixos/modules/programs/guix.nix index e20572b..609fb08 100644 --- a/nixos/modules/programs/guix.nix +++ b/nixos/modules/programs/guix.nix @@ -1,7 +1,6 @@ { lib, config, - options, ... }: let @@ -20,10 +19,6 @@ in enable = true; dates = "weekly"; }; - substituters.urls = [ - "https://mirror.sjtu.edu.cn/guix/" - ] - ++ options.services.guix.substituters.urls.default; }; }; } diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 0069ba5..c8200cf 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -15,7 +15,6 @@ in ./spotifyd.nix ./nautilus.nix ./neovim-nightly.nix - ./vim.nix # Nur ./nur.nix diff --git a/overlays/modifications/vim.nix b/overlays/modifications/vim.nix deleted file mode 100644 index 2bbaec2..0000000 --- a/overlays/modifications/vim.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ outputs, ... }: -_final: prev: -let - inherit (prev.stdenv.hostPlatform) system; -in -{ - vim = outputs.packages.${system}.vim'; -} diff --git a/pkgs/vim'/package.nix b/pkgs/vim'/package.nix deleted file mode 100644 index 224addf..0000000 --- a/pkgs/vim'/package.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ vim-full, vimPlugins }: -vim-full.customize { - name = "vim"; - - vimrcConfig = { - customRC = builtins.readFile ./vimrc.vim; - packages.myVimPackage = { - start = with vimPlugins; [ - vim-one - vim-airline - ]; - opt = [ ]; - }; - }; -} diff --git a/pkgs/vim'/vimrc.vim b/pkgs/vim'/vimrc.vim deleted file mode 100644 index 93c5e9d..0000000 --- a/pkgs/vim'/vimrc.vim +++ /dev/null @@ -1,66 +0,0 @@ -source $VIMRUNTIME/defaults.vim - -colorscheme one -set background=light - -" Set airline -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#formatter = "unique_tail_improved" -let g:airline_powerline_fonts = 1 - -" Set option -set autoindent -set autoread -set backspace=indent,eol,start -set nobackup -set breakindent -set breakindentopt=sbr -set showbreak=↪ -set cdhome -set cmdheight=1 -set completeopt=fuzzy,menuone,noselect,popup -set concealcursor=v -set confirm -set cursorline -set cursorlineopt=number,screenline -set diffopt=algorithm:minimal,closeoff,context:20,followwrap,internal,linematch:40 -set errorbells -set expandtab -set exrc -set foldcolumn=0 -set fsync -set nogdefault -set helplang=zh,en -set history=10000 -set hlsearch -set ignorecase -set smartcase -set list -set listchars=tab:--→,trail:·,multispace:\ ,nbsp:⍽,space:· -set magic -set more -set mouse=a -set number -set numberwidth=4 -set relativenumber -set scrolloff=5 -set shiftround -set shiftwidth=2 -set noshowmode -set signcolumn=yes -set smoothscroll -set splitbelow -set splitright -set startofline -set noswapfile -set tabclose=uselast -set tabstop=2 -set termguicolors -set undofile -set undolevels=100000 -set virtualedit=block,onemore -set whichwrap=b,s,\<,\> -set wildmenu -set wildmode=full -set wildoptions=fuzzy,pum -set wrap