diff --git a/flake.lock b/flake.lock index ce264ad..6b4f4fa 100644 --- a/flake.lock +++ b/flake.lock @@ -7,15 +7,16 @@ ] }, "locked": { - "lastModified": 1756579987, - "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", + "lastModified": 1782704057, + "narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=", "owner": "nix-community", "repo": "home-manager", - "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", + "rev": "868d0a692de703c2de98fab61968e4e310b7c28e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -42,16 +43,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770136044, - "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", + "lastModified": 1782691344, + "narHash": "sha256-i5nw9BYYsMDAaOC4J+JmTof6b2GhlyH076awYRNrTV8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", + "rev": "1f01958ffb5b3545c96d9ef2f4e24c5e5e1eb846", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f493571..9fa0319 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,10 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; home-manager = { - url = "github:nix-community/home-manager"; + # url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database.url = "github:nix-community/nix-index-database"; diff --git a/git/.config/git/config b/git/.config/git/config index 4a065de..c2c94d8 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -11,3 +11,5 @@ [includeIf "gitdir:~/git/work/tcs/"] path = tcs.config +[init] + defaultBranch = main diff --git a/home-manager/common.nix b/home-manager/common.nix index cb5f609..184b9fb 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -215,8 +215,10 @@ in markdown ])) ]; + withRuby = false; + withPython3 = true; - extraLuaConfig = '' + initLua = '' vim.opt.foldmethod = "expr" vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()" vim.opt.foldlevel = 99 diff --git a/niri/.config/niri/monitors.kdl b/niri/.config/niri/monitors.kdl index f17159d..9c65478 100644 --- a/niri/.config/niri/monitors.kdl +++ b/niri/.config/niri/monitors.kdl @@ -1,17 +1,13 @@ // Generated by Monique — https://github.com/ToRvaLDz/monique -output "Chimei Innolux Corporation 0x144F Unknown" { - off -} - -output "Invalid Vendor Codename - RTK 0x0101 0x01010101" { - mode "2160x1440@59.996" - scale 1 - position x=2795 y=1920 -} - output "PNP(BNQ) BenQ EL2870U 19L03451SL0" { - mode "2560x1440@59.951" - scale 1 - position x=2571 y=480 + mode "3840x2160@30.000" + scale 1.5 + position x=3982 y=1499 +} + +output "Chimei Innolux Corporation 0x144F Unknown" { + mode "1920x1080@60.001" + scale 1 + position x=2062 y=1672 }