dot013/nix
1
0
Fork 0
Code Issues Pull Requests Activity

chore: move to stable branch

Browse Source
This commit is contained in:
Gustavo "Guz" L. de Mello
2024-08-09 21:53:29 -03:00
parent 96c7fbd3b0
commit 735a5eb5af
4 changed files with 106 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
flake.lock generated
View File

@@ -18,7 +18,9 @@
},
"dot013-environment": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719339205,
@@ -43,11 +45,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1720290646,
"narHash": "sha256-3qOtNUQN8IX553JnnVirK4nwpi0EDnhFXHZS80+F8y4=",
"lastModified": 1722917006,
"narHash": "sha256-29qBs5HlcegrLP8oQe8T9hHx7u94TEz9ivPwZlorAJU=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "e6d4bbd22a5a582b166c8a5f120d2bb21454f194",
"rev": "8552abe55a4f364d94efb84502a550c2c9c3101c",
"type": "gitlab"
},
"original": {
@@ -108,11 +110,11 @@
},
"flatpaks": {
"locked": {
"lastModified": 1711997375,
"narHash": "sha256-KvU4gOtuFMS9Il67glRGtdNfguAINT9pCaXtvCL8uI8=",
"lastModified": 1721549352,
"narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "45bf66f7068db79b552da864c0e87452be624d6c",
"rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b",
"type": "github"
},
"original": {
@@ -128,15 +130,16 @@
]
},
"locked": {
"lastModified": 1720289319,
"narHash": "sha256-E3CjSsXNDWYqoNjrKQLPdEZDLR+mVI9HMa+jY//FjBY=",
"lastModified": 1720042825,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "10486e6b311b3c5ae1c3477fee058704cea7cb4a",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@@ -157,11 +160,11 @@
]
},
"locked": {
"lastModified": 1717181720,
"narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
"lastModified": 1718450675,
"narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
"rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
"type": "github"
},
"original": {
@@ -176,25 +179,27 @@
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"xdph": "xdph"
},
"locked": {
"lastModified": 1718272446,
"narHash": "sha256-hLnnNBWP1Qjs1I3fndMgp8rbWJruxdnGTq77A4Rv4R4=",
"lastModified": 1719317162,
"narHash": "sha256-JmfnYz+9a4TjNl3mAus1VpoWtTI9d1xkW9MHbkcV0Po=",
"ref": "refs/heads/main",
"rev": "9e781040d9067c2711ec2e9f5b47b76ef70762b3",
"revCount": 4818,
"rev": "918d8340afd652b011b937d29d5eea0be08467f5",
"revCount": 4886,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland?ref=v0.41.1"
"url": "https://github.com/hyprwm/Hyprland?ref=v0.41.2"
},
"original": {
"rev": "9e781040d9067c2711ec2e9f5b47b76ef70762b3",
"rev": "918d8340afd652b011b937d29d5eea0be08467f5",
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland?ref=v0.41.1"
"url": "https://github.com/hyprwm/Hyprland?ref=v0.41.2"
}
},
"hyprland-protocols": {
@@ -211,11 +216,11 @@
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"lastModified": 1714869498,
"narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"type": "github"
},
"original": {
@@ -312,11 +317,11 @@
]
},
"locked": {
"lastModified": 1717881334,
"narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
"lastModified": 1719316102,
"narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
"rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
"type": "github"
},
"original": {
@@ -337,11 +342,11 @@
]
},
"locked": {
"lastModified": 1717784906,
"narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
"lastModified": 1719067853,
"narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
"rev": "914f083741e694092ee60a39d31f693d0a6dc734",
"type": "github"
},
"original": {
@@ -376,11 +381,11 @@
]
},
"locked": {
"lastModified": 1719832725,
"narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
"lastModified": 1722740924,
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
"type": "github"
},
"original": {
@@ -393,14 +398,16 @@
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1720229044,
"narHash": "sha256-jkLSqdj009HwdzS5p4Ue+Ey65/h2nLzuNg3wvl/eG3s=",
"lastModified": 1722908114,
"narHash": "sha256-GL49XvmlK40p1O/JNY4pZQvN+ybavzfZNYPcXJBiRk8=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "adbf35df8ecd909ef0d635276c572adc6f871bda",
"rev": "5dcf0bb1c3fc68c5487e632911b3d17bc31f8382",
"type": "github"
},
"original": {
@@ -411,16 +418,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718318537,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
"lastModified": 1722869614,
"narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
"rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -442,11 +449,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1719720450,
"narHash": "sha256-57+R2Uj3wPeDeq8p8un19tzFFlgWiXJ8PbzgKtBgBX8=",
"lastModified": 1721524707,
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "78f8641796edff3bfabbf1ef5029deadfe4a21d0",
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github"
},
"original": {
@@ -456,29 +463,13 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1717974879,
"narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github"
},
"original": {
@@ -488,70 +479,24 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1720031269,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1716769173,
"narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"rec-sh": {
"inputs": {
"nixpkgs": "nixpkgs_5"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1717124269,
"narHash": "sha256-CboDW1jTZST8WwjUrrh/d+AiQ9Cz7MyDGuP4aUP4Ghw=",
"ref": "refs/heads/main",
"owner": "dot013",
"repo": "rec.sh",
"rev": "437b7475d283b76da1625e53648f6f2ed3b82378",
"revCount": 13,
"type": "git",
"url": "file:///home/guz/.projects/dot013/rec.sh"
"type": "github"
},
"original": {
"type": "git",
"url": "file:///home/guz/.projects/dot013/rec.sh"
"owner": "dot013",
"repo": "rec.sh",
"type": "github"
}
},
"root": {
@@ -564,7 +509,8 @@
"nix-colors": "nix-colors",
"nix-index-database": "nix-index-database",
"nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"rec-sh": "rec-sh",
"sops-nix": "sops-nix",
"tmux-plugin-manager": "tmux-plugin-manager",
@@ -579,11 +525,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1720187017,
"narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=",
"lastModified": 1722897572,
"narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "1b11e208cee97c47677439625dc22e5289dcdead",
"rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
"type": "github"
},
"original": {
@@ -672,7 +618,9 @@
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"hyprlang": "hyprlang_2",
"nixpkgs": "nixpkgs_6",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_4"
},
"locked": {
@@ -707,11 +655,11 @@
]
},
"locked": {
"lastModified": 1717918856,
"narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
"lastModified": 1718619174,
"narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "72907822c19afc0983c69d59d299204381623725",
"rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
"type": "github"
},
"original": {

41
flake.nix
View File

@@ -2,10 +2,11 @@
description = "Nixos config flake";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -20,11 +21,15 @@
};
# Declaratively install flatpaks
flatpaks.url = "github:gmodena/nix-flatpak"; # Fork is being used until #24 merges
flatpaks = {
url = "github:gmodena/nix-flatpak"; # Fork is being used until #24 merges
};
# flatpaks.url = "github:Tomaszal/nix-flatpak/feature/overrides";
# Used for theming the OS, see modules/home-manager/theme.nix
nix-colors.url = "github:misterio77/nix-colors";
nix-colors = {
url = "github:misterio77/nix-colors";
};
firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
@@ -37,20 +42,33 @@
flake = false;
};
rec-sh.url = "git+file:///home/guz/.projects/dot013/rec.sh";
rec-sh = {
url = "github:dot013/rec.sh";
inputs.nixpkgs.follows = "nixpkgs";
};
# dot013-environment.url = "git+file:///home/guz/.projects/dot013/environment";
dot013-environment.url = "github:dot013/environment";
dot013-environment = {
# url = "git+file:///home/guz/.projects/dot013/environment";
url = "github:dot013/environment";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
nix-minecraft = {
url = "github:Infinidoge/nix-minecraft";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
type = "git";
url = "https://github.com/hyprwm/Hyprland?ref=v0.41.1";
rev = "9e781040d9067c2711ec2e9f5b47b76ef70762b3";
url = "https://github.com/hyprwm/Hyprland?ref=v0.41.2";
rev = "918d8340afd652b011b937d29d5eea0be08467f5";
submodules = true;
inputs.nixpkgs.follows = "nixpkgs";
};
xdg-desktop-portal-hyprland = {
url = "github:hyprwm/xdg-desktop-portal-hyprland/v1.3.2";
inputs.nixpkgs.follows = "nixpkgs";
};
xdg-desktop-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland/v1.3.2";
/*
Note to self:
The last commit with working screen share, as the time of writing this, was
@@ -66,6 +84,7 @@
self,
nixpkgs,
home-manager,
nixpkgs-unstable,
...
} @ inputs: let
create-host = configs:

2
hosts/battleship/configuration.nix
View File

@@ -132,8 +132,6 @@
];
nameservers = ["8.8.8.8" "1.1.1.1"];
};
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {

2
hosts/battleship/desktop/default.nix
View File

@@ -133,7 +133,7 @@ in {
follow_mouse = 1;
sensitivity = 0;
};
master.new_is_master = true;
# master.new_is_master = true;
monitor = [
"${monitor-1},2560x1080,0x0,1"
"${monitor-2},1920x1080,2560x0,1"